Fix inconsistency in browser shortcut handling when a BrowserAction popup is focused.

chrome/browser/extensions/extension_host.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/extensions/extension_host.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
@@ skipping 35 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#if defined(TOOLKIT_VIEWS)
-#include "ui/views/widget/widget.h"
-#endif
-
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 using content::NativeWebKeyboardEvent;
 using content::OpenURLParams;
 using content::RenderViewHost;
 using content::SiteInstance;
 using content::WebContents;
 
 // Helper class that rate-limits the creation of renderer processes for
 // ExtensionHosts, to avoid blocking the UI.
@@ skipping 385 matching lines @@
   }
 }
 
 bool ExtensionHost::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                            bool* is_keyboard_shortcut) {
   if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP &&
       event.type == NativeWebKeyboardEvent::RawKeyDown &&
       event.windowsKeyCode == ui::VKEY_ESCAPE) {
     DCHECK(is_keyboard_shortcut != NULL);
     *is_keyboard_shortcut = true;
+    return false;
   }
+
+  // Handle higher priority browser shortcuts such as Ctrl-w.
+  Browser* browser = view() ? view()->browser() : NULL;
+  if (browser)
+    return browser->PreHandleKeyboardEvent(event, is_keyboard_shortcut);
+
+  *is_keyboard_shortcut = false;
   return false;
 }
 
 void ExtensionHost::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
   if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP) {
     if (event.type == NativeWebKeyboardEvent::RawKeyDown &&
         event.windowsKeyCode == ui::VKEY_ESCAPE) {
       Close();
       return;
     }
@@ skipping 32 matching lines @@
     pm->IncrementLazyKeepaliveCount(extension());
 }
 
 void ExtensionHost::OnDecrementLazyKeepaliveCount() {
   ExtensionProcessManager* pm =
       ExtensionSystem::Get(profile_)->process_manager();
   if (pm)
     pm->DecrementLazyKeepaliveCount(extension());
 }
 
+void ExtensionHost::UnhandledKeyboardEvent(
+    const content::NativeWebKeyboardEvent& event) {
+  // Handle lower priority browser shortcuts such as Ctrl-f.
+  Browser* browser = view() ? view()->browser() : NULL;
+  if (browser)
+    return browser->HandleKeyboardEvent(event);
+}
 
 void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) {
   render_view_host_ = render_view_host;
 
   if (view())
     view()->RenderViewCreated();
 
   // If the host is bound to a window, then extract its id. Extensions hosted
   // in ExternalTabContainer objects may not have an associated window.
   ExtensionWindowController* window = GetExtensionWindowController();
@@ skipping 72 matching lines @@
   params.user_gesture = user_gesture;
   browser::Navigate(&params);
 }
 
 void ExtensionHost::RenderViewReady() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_HOST_CREATED,
       content::Source<Profile>(profile_),
       content::Details<ExtensionHost>(this));
 }