Refactor GlobalShortcutListener.

chrome/browser/extensions/global_shortcut_listener_ozone.cc

Index: chrome/browser/extensions/global_shortcut_listener_ozone.cc
diff --git a/chrome/browser/extensions/global_shortcut_listener_ozone.cc b/chrome/browser/extensions/global_shortcut_listener_ozone.cc
index f1067d45e826d391769abd9ec718819a728c105e..414b1c567b1caa358887a8d86f2a0d6e56d94679 100644
--- a/chrome/browser/extensions/global_shortcut_listener_ozone.cc
+++ b/chrome/browser/extensions/global_shortcut_listener_ozone.cc
@@ -8,19 +8,14 @@
 
 using content::BrowserThread;
 
-namespace {
-
-static base::LazyInstance<extensions::GlobalShortcutListenerOzone> instance =
-    LAZY_INSTANCE_INITIALIZER;
-
-}  // namespace
-
 namespace extensions {
 
 // static
 GlobalShortcutListener* GlobalShortcutListener::GetInstance() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  return instance.Pointer();
+  static GlobalShortcutListenerOzone* instance =
+      new GlobalShortcutListenerOzone();
+  return instance;
 }
 
 GlobalShortcutListenerOzone::GlobalShortcutListenerOzone()
@@ -48,28 +43,22 @@ void GlobalShortcutListenerOzone::StopListening() {
   is_listening_ = false;
 }
 
-void GlobalShortcutListenerOzone::RegisterAccelerator(
-    const ui::Accelerator& accelerator,
-    GlobalShortcutListener::Observer* observer) {
+bool GlobalShortcutListenerOzone::RegisterAcceleratorImpl(
+    const ui::Accelerator& accelerator) {
   NOTIMPLEMENTED();
   // To implement:
   // 1) Convert modifiers to platform specific modifiers.
   // 2) Register for the hotkey.
-  // 3) If not successful, log why.
-  // 4) Else, call base class RegisterAccelerator.
+  // 3) If not successful, return false.
+  // 4) Else, return true.
 
-  GlobalShortcutListener::RegisterAccelerator(accelerator, observer);
+  return false;
 }
 
-void GlobalShortcutListenerOzone::UnregisterAccelerator(
-    const ui::Accelerator& accelerator,
-    GlobalShortcutListener::Observer* observer) {
+void GlobalShortcutListenerOzone::UnregisterAcceleratorImpl(
+    const ui::Accelerator& accelerator) {
   NOTIMPLEMENTED();
-  // To implement:
-  // 1) Unregister for the hotkey.
-  // 2) Call base class UnregisterAccelerator.
-
-  GlobalShortcutListener::UnregisterAccelerator(accelerator, observer);
+  // To implement: Unregister for the hotkey.
 }
 
 }  // namespace extensions