Linux accelerators cleanup

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 "base/gfx/rect.h"
@@ skipping 19 matching lines @@
   virtual ~BrowserWindowGtk();
 
   // Overridden from BrowserWindow
   virtual void Init();
   virtual void Show();
   virtual void SetBounds(const gfx::Rect& bounds);
   virtual void Close();
   virtual void Activate();
   virtual bool IsActive() const;
   virtual void FlashFrame();
-  virtual void* GetNativeHandle();
+  virtual gfx::NativeWindow GetNativeHandle();
   virtual BrowserWindowTesting* GetBrowserWindowTesting();
   virtual StatusBubble* GetStatusBubble();
   virtual void SelectedTabToolbarSizeChanged(bool is_animating);
   virtual void UpdateTitleBar();
   virtual void UpdateLoadingAnimations(bool should_animate);
   virtual void SetStarredState(bool is_starred);
   virtual gfx::Rect GetNormalBounds() const;
   virtual bool IsMaximized() const;
   virtual void SetFullscreen(bool fullscreen);
   virtual bool IsFullscreen() const;
@@ skipping 32 matching lines @@
   void OnStateChanged(GdkWindowState state);
 
  protected:
   virtual void DestroyBrowser();
   GtkWindow* window_;
   GtkWidget* vbox_;
 
   scoped_ptr<Browser> browser_;
 
  private:
+  // Connect accelerators that aren't connected to menu items (like ctrl-o,
+  // ctrl-l, etc.).
+  void ConnectAccelerators();
+
   // Change whether we're showing the custom blue frame.
   // Must be called once at startup.
   // Triggers relayout of the content.
   void SetCustomFrame(bool custom_frame);
 
   // Callback for when the "content area" vbox needs to be redrawn.
   // The content area includes the toolbar and web page but not the tab strip.
   // It has a soft gray border when we have a custom frame.
   static gboolean OnContentAreaExpose(GtkWidget* widget, GdkEventExpose* e,
                                       BrowserWindowGtk* window);
 
   static gboolean OnWindowDestroyed(GtkWidget* window,
                                     BrowserWindowGtk* browser_win);
+
+  static gboolean OnAccelerator(GtkAccelGroup* accel_group,
+                                GObject* acceleratable,
+                                guint keyval,
+                                GdkModifierType modifier,
+                                BrowserWindowGtk* browser_window);
+
   gfx::Rect bounds_;
   GdkWindowState state_;
 
   // Theme graphics for the content area.
   scoped_ptr<NineBox> content_area_ninebox_;
 
   // Whether we're drawing the custom Chrome frame (including title bar).
   bool custom_frame_;
 
   // The object that manages all of the widgets in the toolbar.
   scoped_ptr<BrowserToolbarGtk> toolbar_;
 
   // The status bubble manager.  Always non-NULL.
   scoped_ptr<StatusBubbleGtk> status_bubble_;
 
   // A container that manages the GtkWidget*s that are the webpage display
   // (along with associated infobars, shelves, and other things that are part
   // of the content area).
   scoped_ptr<TabContentsContainerGtk> contents_container_;
 
   // The Find Bar. This may be NULL if there is no Find Bar, and if it is
   // non-NULL, it may or may not be visible.  It is possible for the Find Bar
   // to move among windows as tabs are dragged around.
   scoped_ptr<FindBarController> find_bar_controller_;
 };
 
 #endif  // CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_