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

chrome/browser/ui/browser.h

Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index eed9b82e2247fa517b14df9c77c75b215e0b4c71..1a002f1dcfdaba9a884d25d1f542e859500abf2d 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -795,6 +795,13 @@ class Browser : public TabStripModelDelegate,
                                      int index) OVERRIDE;
   virtual void TabStripEmpty() OVERRIDE;
 
+  // Overridden from content::WebContentsDelegate:
+  virtual bool PreHandleKeyboardEvent(
+      const content::NativeWebKeyboardEvent& event,
+      bool* is_keyboard_shortcut) OVERRIDE;
+  virtual void HandleKeyboardEvent(
+      const content::NativeWebKeyboardEvent& event) OVERRIDE;
+
   // Fullscreen permission infobar callbacks.
   // TODO(koz): Remove this and have callers call FullscreenController directly.
   void OnAcceptFullscreenPermission(const GURL& url,
@@ -932,11 +939,6 @@ class Browser : public TabStripModelDelegate,
       content::WebContents* source,
       const GURL& frame_url,
       const std::string& frame_content_state) OVERRIDE;
-  virtual bool PreHandleKeyboardEvent(
-      const content::NativeWebKeyboardEvent& event,
-      bool* is_keyboard_shortcut) OVERRIDE;
-  virtual void HandleKeyboardEvent(
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
   virtual void ShowRepostFormWarningDialog(
       content::WebContents* source) OVERRIDE;
   virtual bool ShouldAddNavigationToHistory(