diff options
| author | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 11:35:51 +0000 |
|---|---|---|
| committer | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 11:35:51 +0000 |
| commit | cc405e47896d2b031f8f42a93337538e162ab1e4 (patch) | |
| tree | 3a77174e1cb82ded7d8b10887a9ed5ac99a01a3f /content/content_tests.gypi | |
| parent | 97b9212540414b501335f3a0adc7284db1eb0050 (diff) | |
| download | chromium_src-cc405e47896d2b031f8f42a93337538e162ab1e4.zip chromium_src-cc405e47896d2b031f8f42a93337538e162ab1e4.tar.gz chromium_src-cc405e47896d2b031f8f42a93337538e162ab1e4.tar.bz2 | |
mac: Load the system hotkeys after launch. (reland)
---------------Reland CL Description---------------------------
System mouse hotkeys were incorrectly being parsed as system keyboard hotkeys.
Other minor changes include:
- Expanded unit tests to include a sparsely populated symbolichotkeys.plist
from a real machine.
- Use correct types for the key_code and modifiers of the event.
- An event must have at least one of ctr/alt/cmd down to be considered a
hotkey.
- Use the NSDeviceIndependentModifierFlagsMask mask to prune out
device-dependent modifier flags, including event coalescing information.
---------------Original CL Description---------------------------
Original CL: https://codereview.chromium.org/370293004/
Shortly after launch, the system hotkeys are loaded and parsed. If a hotkey is
reserved by the system, it is not passed to the renderer. This allows system
hotkeys like (cmd + `) to work even if a flash plugin is selected.
Add a histogram to ensure that the system hotkey plist is being correctly
loaded and parsed.
BUG=383558, 395187
TEST=Open 2 Chrome windows. Navigate one to www.twitch.tv. The site should
include a flash plugin that automatically starts playing a video. Select the
flash plugin. The hotkey combination (cmd + `) should switch between the open
windows. The hotkey combination (cmd + L) should have no effect (it is a Chrome
hotkey, not a browser hotkey).
Review URL: https://codereview.chromium.org/408973002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_tests.gypi')
| -rw-r--r-- | content/content_tests.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 61f541c..5aa4712 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -407,6 +407,7 @@ 'browser/browser_url_handler_impl_unittest.cc', 'browser/byte_stream_unittest.cc', 'browser/child_process_security_policy_unittest.cc', + 'browser/cocoa/system_hotkey_map_unittest.mm', 'browser/compositor/software_browser_compositor_output_surface_unittest.cc', 'browser/compositor/software_output_device_ozone_unittest.cc', 'browser/databases_table_unittest.cc', |