Refactor GlobalShortcutListener.

chrome/browser/extensions/global_shortcut_listener_ozone.h

Index: chrome/browser/extensions/global_shortcut_listener_ozone.h
diff --git a/chrome/browser/extensions/global_shortcut_listener_ozone.h b/chrome/browser/extensions/global_shortcut_listener_ozone.h
index 01d2953553d31dbcd7a81a6e7cf573316043553a..7250350efc605cf99b9ce2f7a5de678456ab5c26 100644
--- a/chrome/browser/extensions/global_shortcut_listener_ozone.h
+++ b/chrome/browser/extensions/global_shortcut_listener_ozone.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_OZONE_H_
 #define CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_OZONE_H_
 
-#include "base/lazy_instance.h"
 #include "chrome/browser/extensions/global_shortcut_listener.h"
 
 namespace extensions {
@@ -15,24 +14,17 @@ namespace extensions {
 // forwards its output to the base class for processing.
 class GlobalShortcutListenerOzone : public GlobalShortcutListener {
  public:
+  GlobalShortcutListenerOzone();
   virtual ~GlobalShortcutListenerOzone();
 
+ private:
+  // GlobalShortcutListener implementation.
   virtual void StartListening() OVERRIDE;
   virtual void StopListening() OVERRIDE;
-
- private:
-  friend struct base::DefaultLazyInstanceTraits<GlobalShortcutListenerOzone>;
-
-  GlobalShortcutListenerOzone();
-
-  // 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;
+  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_;