Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5965)

Unified Diff: chrome/browser/extensions/global_shortcut_listener_mac.h

Issue 60353008: Mac global keybindings (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/global_shortcut_listener_mac.h
===================================================================
--- chrome/browser/extensions/global_shortcut_listener_mac.h (revision 235137)
+++ chrome/browser/extensions/global_shortcut_listener_mac.h (working copy)
@@ -5,15 +5,23 @@
#ifndef CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_MAC_H_
#define CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_MAC_H_
-#include "base/lazy_instance.h"
#include "chrome/browser/extensions/global_shortcut_listener.h"
+#include <Carbon/Carbon.h>
Robert Sesek 2013/11/21 16:29:56 nit: blank line after
Robert Sesek 2013/11/21 16:29:56 Also nee #include <CoreFoundation/CoreFoundation.h
smus 2013/11/22 02:06:38 Done.
smus 2013/11/22 02:06:38 Don't follow. after the Carbon include?
Robert Sesek 2013/11/22 16:49:59 Yes.
+#include <map>
+
+#include "base/lazy_instance.h"
+#include "base/mac/scoped_nsobject.h"
+
namespace extensions {
// Mac-specific implementation of the GlobalShortcutListener class that
// listens for global shortcuts. Handles basic keyboard intercepting and
// forwards its output to the base class for processing.
-// TODO(finnur/smus): Implement this class.
+//
+// Uses an event tap for intercepting media keys (PlayPause, NextTrack,
+// PreviousTrack). Also uses the Carbon RegisterEventHotKey API for binding to
+// non-media key global keyboard shortcuts (eg. Command-Shift-1).
class GlobalShortcutListenerMac : public GlobalShortcutListener {
public:
virtual ~GlobalShortcutListenerMac();
@@ -21,6 +29,13 @@
virtual void StartListening() OVERRIDE;
virtual void StopListening() OVERRIDE;
+ // Keyboard event callbacks.
+ bool OnKeyEvent(EventHotKeyID hotKeyID);
+ bool OnMediaKeyEvent(int keyCode);
+
+ // Re-enable the event tap if it was disabled by a timeout.
+ void EnableTap();
Robert Sesek 2013/11/21 16:29:56 This shouldn't be public. Why don't you friend the
+
private:
friend struct base::DefaultLazyInstanceTraits<GlobalShortcutListenerMac>;
@@ -35,9 +50,48 @@
const ui::Accelerator& accelerator,
GlobalShortcutListener::Observer* observer) OVERRIDE;
+ // Mac-specific functions for registering a keyboard shortcut.
+ void RegisterHotKey(const ui::Accelerator& accelerator);
+ void UnregisterHotKey(const ui::Accelerator& accelerator);
+
+ // Enable and disable the media key event tap.
+ void StartWatchingMediaKeys();
+ void StopWatchingMediaKeys();
+
+ // Convert from mac media key code to the equivalent keyboard code.
+ ui::KeyboardCode MediaKeyCodeToKeyboardCode(int keyCode);
+
+ // Determine if a key is a media key or not.
+ // TODO(smus): Use the one in CommandService.
+ bool IsMediaKey(const ui::Accelerator& accelerator);
+
+ // Whether or not any media keys are currently registered.
+ bool AreMediaKeysRegistered();
+
// Whether this object is listening for global shortcuts.
bool is_listening_;
+ // A counter representing the current hotkey identifier.
+ int hotkey_id_ = 0;
+
+ // A map of all hotkeys (media keys and shortcuts) mapping to their
+ // corresponding hotkey IDs. For quickly finding if an accelerator is
+ // registered.
+ typedef std::map<ui::Accelerator, int> HotKeyIdMap;
+ HotKeyIdMap hotkey_ids_;
+
+ // The inverse map for quickly looking up accelerators by hotkey id.
+ typedef std::map<int, ui::Accelerator> IdHotKeyMap;
+ IdHotKeyMap id_hotkeys_;
+
+ // Keyboard shortcut IDs to hotkeys map for unregistration.
+ typedef std::map<int, EventHotKeyRef> IdHotKeyRefMap;
+ IdHotKeyRefMap id_hotkey_refs_;
+
+ // Event tap for intercepting mac media keys.
+ CFMachPortRef event_tap_;
+ CFRunLoopSourceRef event_tap_source_;
+
DISALLOW_COPY_AND_ASSIGN(GlobalShortcutListenerMac);
};

Powered by Google App Engine
This is Rietveld 408576698