Chromium Code Reviews| Index: chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc |
| diff --git a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc |
| index 8808ff31e57234d6580db97dee4e586a04ebb9d4..b2888bf7b7f0ab6963b84d104bda04c24d5d34c8 100644 |
| --- a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc |
| +++ b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc |
| @@ -10,6 +10,8 @@ |
| #include "base/logging.h" |
| #include "base/strings/string16.h" |
| #include "chrome/app/chrome_command_ids.h" |
| +#include "chrome/browser/ui/browser_finder.h" |
| +#include "chrome/browser/ui/views/frame/browser_view.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/grit/generated_resources.h" |
| #include "components/renderer_context_menu/views/toolkit_delegate_views.h" |
| @@ -129,6 +131,20 @@ bool RenderViewContextMenuViews::GetAcceleratorForCommandId( |
| *accel = ui::Accelerator(ui::VKEY_S, ui::EF_CONTROL_DOWN); |
| return true; |
| + case IDC_EXIT_FULLSCREEN: |
| + if (IsHTML5Fullscreen()) { |
| + *accel = ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE); |
| + return true; |
| + } else { |
|
sky
2016/07/07 17:00:41
nit: no else after return.
Matt Giuca
2016/07/08 00:55:46
Done.
|
| + ui::AcceleratorProvider* accelerator_provider = |
| + GetBrowserAcceleratorProvider(); |
| + if (!accelerator_provider) |
| + return false; |
| + |
| + return accelerator_provider->GetAcceleratorForCommandId(IDC_FULLSCREEN, |
|
sky
2016/07/07 17:00:41
It isn't obvious why you're using the accelerator
Matt Giuca
2016/07/08 00:55:46
Done.
|
| + accel); |
| + } |
| + |
| case IDC_VIEW_SOURCE: |
| *accel = ui::Accelerator(ui::VKEY_U, ui::EF_CONTROL_DOWN); |
| return true; |
| @@ -200,6 +216,15 @@ bool RenderViewContextMenuViews::IsCommandIdEnabled(int command_id) const { |
| } |
| } |
| +ui::AcceleratorProvider* |
| +RenderViewContextMenuViews::GetBrowserAcceleratorProvider() const { |
| + Browser* browser = chrome::FindBrowserWithWebContents(source_web_contents_); |
| + if (!browser) |
| + return nullptr; |
| + |
| + return BrowserView::GetBrowserViewForBrowser(browser); |
| +} |
| + |
| void RenderViewContextMenuViews::AppendPlatformEditableItems() { |
| bidi_submenu_model_.AddCheckItem( |
| IDC_WRITING_DIRECTION_DEFAULT, |