diff options
| author | sschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 13:30:30 +0000 |
|---|---|---|
| committer | sschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 13:30:30 +0000 |
| commit | 852a55d0d7ba1f3c653ae9ce9638bd6445473ce9 (patch) | |
| tree | 4565885316f60a4fe4e00868a18aaa2376ffe013 /ash/accelerators/accelerator_controller.h | |
| parent | 585e1331aa544d62587c5f2daf1207300876eff5 (diff) | |
| download | chromium_src-852a55d0d7ba1f3c653ae9ce9638bd6445473ce9.zip chromium_src-852a55d0d7ba1f3c653ae9ce9638bd6445473ce9.tar.gz chromium_src-852a55d0d7ba1f3c653ae9ce9638bd6445473ce9.tar.bz2 | |
fix for 156227, 153077, 134093
The fix for 153077 (10977088) was reverted because the ash_unittests failed for non ChromeOS. The only change is that I moved "#if defined(OS_CHROMEOS)" to encompass the whole newly added test:
AcceleratorControllerTest.DisallowedAtModalWindow
in file:
ash/accelerators/accelerator_controller_unittest.cc
see also:
http://code.google.com/p/chromium/issues/detail?id=156227
https://codereview.chromium.org/11189021
http://code.google.com/p/chromium/issues/detail?id=153077
https://chromiumcodereview.appspot.com/10977088/
http://code.google.com/p/chromium/issues/detail?id=134093
https://chromiumcodereview.appspot.com/10993067/
BUG=156227
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/11189021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller.h')
| -rw-r--r-- | ash/accelerators/accelerator_controller.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h index 0e2ddf4..672e895 100644 --- a/ash/accelerators/accelerator_controller.h +++ b/ash/accelerators/accelerator_controller.h @@ -115,6 +115,8 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget { std::set<int> actions_allowed_at_login_screen_; // Actions allowed when the screen is locked. std::set<int> actions_allowed_at_lock_screen_; + // Actions allowed when a modal window is up. + std::set<int> actions_allowed_at_modal_window_; // Reserved actions. See accelerator_table.h for details. std::set<int> reserved_actions_; |