Refactor the keyboard events handling code related to RenderViewHostDelegate:...

chrome/browser/gtk/browser_window_gtk.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_
 #define CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <map>
@@ skipping 36 matching lines @@
 // it needs to manipulate the window.
 
 class BrowserWindowGtk : public BrowserWindow,
                          public NotificationObserver,
                          public TabStripModelObserver,
                          public ActiveWindowWatcherX::Observer {
  public:
   explicit BrowserWindowGtk(Browser* browser);
   virtual ~BrowserWindowGtk();
 
-  // Process a keyboard event which was not handled by webkit.
-  bool HandleKeyboardEvent(GdkEventKey* event);
-
   // Overridden from BrowserWindow
   virtual void Show();
   virtual void SetBounds(const gfx::Rect& bounds);
   virtual void Close();
   virtual void Activate();
   virtual bool IsActive() const;
   virtual void FlashFrame();
   virtual gfx::NativeWindow GetNativeHandle();
   virtual BrowserWindowTesting* GetBrowserWindowTesting();
   virtual StatusBubble* GetStatusBubble();
@@ skipping 44 matching lines @@
                               gfx::NativeWindow parent_window);
   virtual void UserChangedTheme();
   virtual int GetExtraRenderViewHeight() const;
   virtual void TabContentsFocused(TabContents* tab_contents);
   virtual void ShowPageInfo(Profile* profile,
                             const GURL& url,
                             const NavigationEntry::SSLStatus& ssl,
                             bool show_history);
   virtual void ShowPageMenu();
   virtual void ShowAppMenu();
-  virtual int GetCommandId(const NativeWebKeyboardEvent& event);
+  virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
+                                      bool* is_keyboard_shortcut);
+  virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
   virtual void ShowCreateShortcutsDialog(TabContents* tab_contents);
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Overridden from TabStripModelObserver:
   virtual void TabDetachedAt(TabContents* contents, int index);
   virtual void TabSelectedAt(TabContents* old_contents,
@@ skipping 137 matching lines @@
   void SetBoundsImpl(const gfx::Rect& bounds, bool exterior);
 
   // Callback for when the custom frame alignment needs to be redrawn.
   // The content area includes the toolbar and web page but not the tab strip.
   static gboolean OnCustomFrameExpose(GtkWidget* widget, GdkEventExpose* event,
                                       BrowserWindowGtk* window);
   // A helper method that draws the shadow above the toolbar and in the frame
   // border during an expose.
   static void DrawContentShadow(cairo_t* cr, BrowserWindowGtk* window);
 
+  // Callback for accelerator activation. |user_data| stores the command id
+  // of the matched accelerator.
   static gboolean OnGtkAccelerator(GtkAccelGroup* accel_group,
                                    GObject* acceleratable,
                                    guint keyval,
                                    GdkModifierType modifier,
-                                   BrowserWindowGtk* browser_window);
+                                   void* user_data);
+
+  // Key press event callback.
+  static gboolean OnKeyPress(GtkWidget* widget,
+                             GdkEventKey* event,
+                             BrowserWindowGtk* window);
 
   // Mouse move and mouse button press callbacks.
   static gboolean OnMouseMoveEvent(GtkWidget* widget,
                                    GdkEventMotion* event,
-                                   BrowserWindowGtk* browser);
+                                   BrowserWindowGtk* window);
   static gboolean OnButtonPressEvent(GtkWidget* widget,
                                      GdkEventButton* event,
-                                     BrowserWindowGtk* browser);
+                                     BrowserWindowGtk* window);
 
   // Maps and Unmaps the xid of |widget| to |window|.
   static void MainWindowMapped(GtkWidget* widget, BrowserWindowGtk* window);
   static void MainWindowUnMapped(GtkWidget* widget, BrowserWindowGtk* window);
 
   // Tracks focus state of browser.
   static gboolean OnFocusIn(GtkWidget* widget,
                             GdkEventFocus* event,
-                            BrowserWindowGtk* browser);
+                            BrowserWindowGtk* window);
   static gboolean OnFocusOut(GtkWidget* widget,
                              GdkEventFocus* event,
-                             BrowserWindowGtk* browser);
+                             BrowserWindowGtk* window);
 
   // A small shim for browser_->ExecuteCommand.
-  void ExecuteBrowserCommand(int id);
+  // Returns true if the command was executed.
+  bool ExecuteBrowserCommand(int id);
 
   // Callback for the loading animation(s) associated with this window.
   void LoadingAnimationCallback();
 
   // Shows UI elements for supported window features.
   void ShowSupportedWindowFeatures();
 
   // Hides UI elements for unsupported window features.
   void HideUnsupportedWindowFeatures();
 
@@ skipping 111 matching lines @@
 
   // The accelerator group used to handle accelerators, owned by this object.
   GtkAccelGroup* accel_group_;
 
   scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_