| Index: chrome/browser/extensions/global_shortcut_listener_win.h
|
| diff --git a/chrome/browser/extensions/global_shortcut_listener_win.h b/chrome/browser/extensions/global_shortcut_listener_win.h
|
| index f327f700433e0ead6320820aeb28e2f5d4939b14..6785e20bb112b8a2ada14e95a7e7d35afad6015a 100644
|
| --- a/chrome/browser/extensions/global_shortcut_listener_win.h
|
| +++ b/chrome/browser/extensions/global_shortcut_listener_win.h
|
| @@ -21,9 +21,6 @@ class GlobalShortcutListenerWin : public GlobalShortcutListener,
|
| public:
|
| virtual ~GlobalShortcutListenerWin();
|
|
|
| - virtual void StartListening() OVERRIDE;
|
| - virtual void StopListening() OVERRIDE;
|
| -
|
| private:
|
| friend struct base::DefaultLazyInstanceTraits<GlobalShortcutListenerWin>;
|
|
|
| @@ -35,14 +32,13 @@ class GlobalShortcutListenerWin : public GlobalShortcutListener,
|
| WPARAM wparam,
|
| LPARAM lparam) OVERRIDE;
|
|
|
| - // 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;
|
|
|
| // Whether this object is listening for global shortcuts.
|
| bool is_listening_;
|
|
|