| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index f596aa13462e5b6c9fd2db850b355ada4b73b04f..e348072bbebf25efd130c7fc2611783cba793920 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -2622,32 +2622,25 @@ bool Browser::ExecuteCommandIfEnabled(int id) {
|
|
|
| bool Browser::IsReservedCommandOrKey(int command_id,
|
| const NativeWebKeyboardEvent& event) {
|
| + // In Apps mode, no keys are reserved.
|
| + if (is_app())
|
| + return false;
|
| +
|
| #if defined(OS_CHROMEOS)
|
| // Chrome OS's top row of keys produces F1-10. Make sure that web pages
|
| - // aren't able to block Chrome from performing the standard actions for F1-F4
|
| - // (F5-7 are grabbed by other X clients and hence don't need this protection,
|
| - // and F8-10 are handled separately in Chrome via a GDK event filter, but
|
| - // let's future-proof this).
|
| + // aren't able to block Chrome from performing the standard actions for F1-F4.
|
| + // We should not handle F5-10 here since they are processed by Ash. See also:
|
| + // crbug.com/127333#c8
|
| ui::KeyboardCode key_code =
|
| static_cast<ui::KeyboardCode>(event.windowsKeyCode);
|
| if (key_code == ui::VKEY_F1 ||
|
| key_code == ui::VKEY_F2 ||
|
| key_code == ui::VKEY_F3 ||
|
| - key_code == ui::VKEY_F4 ||
|
| - key_code == ui::VKEY_F5 ||
|
| - key_code == ui::VKEY_F6 ||
|
| - key_code == ui::VKEY_F7 ||
|
| - key_code == ui::VKEY_F8 ||
|
| - key_code == ui::VKEY_F9 ||
|
| - key_code == ui::VKEY_F10) {
|
| + key_code == ui::VKEY_F4) {
|
| return true;
|
| }
|
| #endif
|
|
|
| - // In Apps mode, no keys are reserved.
|
| - if (is_app())
|
| - return false;
|
| -
|
| if (window_->IsFullscreen() && command_id == IDC_FULLSCREEN)
|
| return true;
|
| return command_id == IDC_CLOSE_TAB ||
|
|
|