| 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.
|
| + 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_;
|
|
|