Refactor GlobalShortcutListener.

chrome/browser/extensions/global_shortcut_listener_x11.h

Index: chrome/browser/extensions/global_shortcut_listener_x11.h
diff --git a/chrome/browser/extensions/global_shortcut_listener_x11.h b/chrome/browser/extensions/global_shortcut_listener_x11.h
index d710206e62422e9d0e70713f9a974f4d03556a0d..11dc6a752f098dd4f3f0b8d929ea97a62a8c3a6c 100644
--- a/chrome/browser/extensions/global_shortcut_listener_x11.h
+++ b/chrome/browser/extensions/global_shortcut_listener_x11.h
@@ -27,10 +27,6 @@ class GlobalShortcutListenerX11 : public GlobalShortcutListener,
  public:
   virtual ~GlobalShortcutListenerX11();
 
-  // GlobalShortcutListener implementation.
-  virtual void StartListening() OVERRIDE;
-  virtual void StopListening() OVERRIDE;
-
   // base::MessagePumpDispatcher implementation.
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
@@ -39,14 +35,13 @@ class GlobalShortcutListenerX11 : public GlobalShortcutListener,
 
   GlobalShortcutListenerX11();
 
-  // Register an |accelerator| with the particular |observer|.
-  virtual void RegisterAccelerator(
-      const ui::Accelerator& accelerator,
-      GlobalShortcutListener::Observer* observer) OVERRIDE;
-  // Unregister an |accelerator| with the particular |observer|.
-  virtual void UnregisterAccelerator(
-      const ui::Accelerator& accelerator,
-      GlobalShortcutListener::Observer* observer) OVERRIDE;
+  // GlobalShortcutListener implementation.
+  virtual void StartListening() OVERRIDE;
+  virtual void StopListening() OVERRIDE;
+  virtual bool RegisterAcceleratorImpl(
+      const ui::Accelerator& accelerator) OVERRIDE;
+  virtual void UnregisterAcceleratorImpl(
+      const ui::Accelerator& accelerator) OVERRIDE;
 
 #if defined(TOOLKIT_GTK)
   // Callback for XEvents of the default root window.