diff options
| author | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 18:45:37 +0000 |
|---|---|---|
| committer | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 18:45:37 +0000 |
| commit | f67e2a5509e3be464c79a7a7345f0701d85bde66 (patch) | |
| tree | 7d03720d0d35e8b2c1e5d894f76559e29f96becc /remoting/host | |
| parent | 60b9e4408a0dc381828631face4113cfffb7e76f (diff) | |
| download | chromium_src-f67e2a5509e3be464c79a7a7345f0701d85bde66.zip chromium_src-f67e2a5509e3be464c79a7a7345f0701d85bde66.tar.gz chromium_src-f67e2a5509e3be464c79a7a7345f0701d85bde66.tar.bz2 | |
Fixed Mac hotkey.
BUG=99396
TEST=Manual
Review URL: http://codereview.chromium.org/8190001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/local_input_monitor_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/host/local_input_monitor_mac.mm b/remoting/host/local_input_monitor_mac.mm index c3955c6..fb105d3 100644 --- a/remoting/host/local_input_monitor_mac.mm +++ b/remoting/host/local_input_monitor_mac.mm @@ -38,7 +38,7 @@ static const NSUInteger kEscKeyCode = 53; GTMCarbonEventDispatcherHandler* handler = [GTMCarbonEventDispatcherHandler sharedEventDispatcherHandler]; hot_key_ = [handler registerHotKey:kEscKeyCode - modifiers:NSShiftKeyMask + modifiers:(NSAlternateKeyMask | NSControlKeyMask) target:self action:@selector(hotKeyHit:) userInfo:nil |