Skip to content

Commit

Permalink
Uplift of #17487 (squashed) to beta
Browse files Browse the repository at this point in the history
  • Loading branch information
brave-builds committed Mar 15, 2023
1 parent 01f55d5 commit 6635432
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion browser/ui/views/omnibox/brave_omnibox_view_views.cc
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ bool BraveOmniboxViewViews::AcceleratorPressed(
CopySanitizedURL(url_to_copy.value());
return true;
}
#endif // BUILDFLAG(IS_WIN)

bool BraveOmniboxViewViews::GetAcceleratorForCommandId(
int command_id,
Expand All @@ -96,7 +97,6 @@ bool BraveOmniboxViewViews::GetAcceleratorForCommandId(
}
return OmniboxViewViews::GetAcceleratorForCommandId(command_id, accelerator);
}
#endif // BUILDFLAG(IS_WIN)

#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
void BraveOmniboxViewViews::ExecuteTextEditCommand(
Expand Down
3 changes: 2 additions & 1 deletion browser/ui/views/omnibox/brave_omnibox_view_views.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ class BraveOmniboxViewViews : public OmniboxViewViews {
#if BUILDFLAG(IS_WIN)
// View overrides:
bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
#endif // BUILDFLAG(IS_WIN)
bool GetAcceleratorForCommandId(int command_id,
ui::Accelerator* accelerator) const override;
#endif // BUILDFLAG(IS_WIN)

#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
// ui::views::Textfield
void ExecuteTextEditCommand(ui::TextEditCommand command) override;
Expand Down

0 comments on commit 6635432

Please sign in to comment.