Refactor GlobalShortcutListener.

chrome/browser/extensions/global_shortcut_listener_chromeos.h

Index: chrome/browser/extensions/global_shortcut_listener_chromeos.h
diff --git a/chrome/browser/extensions/global_shortcut_listener_chromeos.h b/chrome/browser/extensions/global_shortcut_listener_chromeos.h
index f052ed6558323d28e74d5043f5a290d3546674bc..87a5616a99727ab9b89a604ebfcc8f4f53a4bac2 100644
--- a/chrome/browser/extensions/global_shortcut_listener_chromeos.h
+++ b/chrome/browser/extensions/global_shortcut_listener_chromeos.h
@@ -20,22 +20,18 @@ class GlobalShortcutListenerChromeOS : public GlobalShortcutListener {
  public:
   virtual ~GlobalShortcutListenerChromeOS();
 
-  virtual void StartListening() OVERRIDE;
-  virtual void StopListening() OVERRIDE;
-
  private:
   friend struct base::DefaultLazyInstanceTraits<GlobalShortcutListenerChromeOS>;

[Mark Mentovai, 2013/12/19 21:03:17]

And this shouldn’t be needed either.

[zhchbin, 2013/12/20 09:13:12]

Done.

 
   GlobalShortcutListenerChromeOS();
 
-  // 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;

[Mark Mentovai, 2013/12/19 21:03:17]

Good call on removing the unused “observer” parameter from the subclasses, which
never used it.

+  virtual void UnregisterAcceleratorImpl(
+      const ui::Accelerator& accelerator) OVERRIDE;
 
   // Whether this object is listening for global shortcuts.
   bool is_listening_;