Refactor GlobalShortcutListener.

chrome/browser/extensions/global_shortcut_listener_mac.h

Index: chrome/browser/extensions/global_shortcut_listener_mac.h
diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.h b/chrome/browser/extensions/global_shortcut_listener_mac.h
index 8c1b5dbfbbe0189effcea5c70c17249c75ff42fb..944450c4a3d5cfbe8e6574337ee694193bfdcdac 100644
--- a/chrome/browser/extensions/global_shortcut_listener_mac.h
+++ b/chrome/browser/extensions/global_shortcut_listener_mac.h
@@ -18,22 +18,18 @@ class GlobalShortcutListenerMac : public GlobalShortcutListener {
  public:
   virtual ~GlobalShortcutListenerMac();
 
-  virtual void StartListening() OVERRIDE;
-  virtual void StopListening() OVERRIDE;
-
  private:
   friend struct base::DefaultLazyInstanceTraits<GlobalShortcutListenerMac>;
 
   GlobalShortcutListenerMac();
 
-  // 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.

[Mark Mentovai, 2013/12/19 15:24:13]

You should definitely discuss this change with Boris, because colliding with his
work that’s been checked in and out and in and out without coordinating with him
would be not so nice.

[Finnur, 2013/12/19 15:40:40]

I checked in Boris' CL (with the test disabled). This will tell us whether the
test really is the cause of the failure or if it is something else. If it is the
test's fault, then I think we should keep his CL in the tree and let him iterate
on trunk getting the test right (so that he doesn't have to suffer through the
refactorings, for one).

[zhchbin, 2013/12/19 15:41:46]

I have cc'ed Boris in the first round of review.

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