summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/accelerator_controller.cc
diff options
context:
space:
mode:
authorafakhry <afakhry@chromium.org>2015-01-12 09:57:43 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-12 17:58:37 +0000
commitcae0618f6fff0122063d231ff3217788707eaaaf (patch)
tree4cd4b1e8d4ea309bda96a78bb1f8c9a7b1d8f11c /ash/accelerators/accelerator_controller.cc
parent7a5b2859441e471e1ac8c459d997918af8e8cd0f (diff)
downloadchromium_src-cae0618f6fff0122063d231ff3217788707eaaaf.zip
chromium_src-cae0618f6fff0122063d231ff3217788707eaaaf.tar.gz
chromium_src-cae0618f6fff0122063d231ff3217788707eaaaf.tar.bz2
System modal dialog unhide shelf launcher, and prevents going into maximized mode.
When shelf is auto hidden, displaying a system modal dialog used to unhide it. That was because the ShelfLayoutManager when updating the shelf visibility, it used to ask the MruWindowTracker to build a list of the windows. This list used to exclude the unfocusable windows (due to the system modal dialog), So the returned list used to be empty which means the shelf should be unhidden. We actually need the list of all visible windows regardless of their focusability. Two unit tests has been written to validate the correct behavior in both single and dual display modes. BUG=277893, 447720 TEST=ash_unittests --gtest_filter=ShelfLayoutManagerTest.ShelfWithSystemModalWindowSingleDisplay, ShelfLayoutManagerTest.ShelfWithSystemModalWindowDualDisplay, MaximizeModeWindowManagerTest.GoingToMaximizedWithModalDialogPresent Review URL: https://codereview.chromium.org/780113002 Cr-Commit-Position: refs/heads/master@{#311063}
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
-rw-r--r--ash/accelerators/accelerator_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 61e00f6..c951f2e 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -1319,7 +1319,7 @@ AcceleratorController::GetAcceleratorProcessingRestriction(int action) {
// cycling through its window elements.
return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION;
}
- if (MruWindowTracker::BuildWindowList().empty() &&
+ if (shell->mru_window_tracker()->BuildMruWindowList().empty() &&
actions_needing_window_.find(action) != actions_needing_window_.end()) {
Shell::GetInstance()->accessibility_delegate()->TriggerAccessibilityAlert(
ui::A11Y_ALERT_WINDOW_NEEDED);