Modify Browser::IsReservedCommandOrKey() to make sure it returns false when an Ash shortcut is pres…

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 2300 matching lines @@
   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.
   // 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) {
+  if ((key_code == ui::VKEY_F1 ||
+       key_code == ui::VKEY_F2 ||
+       key_code == ui::VKEY_F3 ||
+       key_code == ui::VKEY_F4) &&
+      // Make sure it's a browser shortcut (i.e. not an Ash one like Alt+F4).
+      command_id != -1) {
     return true;
   }
 #endif
 
   if (window_->IsFullscreen() && command_id == IDC_FULLSCREEN)
     return true;
   return command_id == IDC_CLOSE_TAB ||
          command_id == IDC_CLOSE_WINDOW ||
          command_id == IDC_NEW_INCOGNITO_WINDOW ||
          command_id == IDC_NEW_TAB ||
@@ skipping 2774 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }