summaryrefslogtreecommitdiffstats
path: root/ash/accelerators
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-20 07:18:49 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-20 07:18:49 +0000
commit063e47d486322281f73f18733b3f5768251b5b41 (patch)
treea9d766d3f3b5276713ecfd60339ba87288e628a9 /ash/accelerators
parentb702d054bc37c5b1ef65e18798ba8597d904aaa9 (diff)
downloadchromium_src-063e47d486322281f73f18733b3f5768251b5b41.zip
chromium_src-063e47d486322281f73f18733b3f5768251b5b41.tar.gz
chromium_src-063e47d486322281f73f18733b3f5768251b5b41.tar.bz2
Fix ash shortcuts not working on the secondary monitor when no window is shown.
BUG=150948 Review URL: https://chromiumcodereview.appspot.com/10964006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
-rw-r--r--ash/accelerators/accelerator_filter.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc
index 376acd2..e2ffa88 100644
--- a/ash/accelerators/accelerator_filter.cc
+++ b/ash/accelerators/accelerator_filter.cc
@@ -25,7 +25,10 @@ bool ShouldProcessAcceleratorsNow(const ui::Accelerator& accelerator,
aura::Window* target) {
if (!target)
return true;
- if (target == Shell::GetPrimaryRootWindow())
+
+ Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ if (std::find(root_windows.begin(), root_windows.end(), target) !=
+ root_windows.end())
return true;
// A full screen window should be able to handle all key events including the