diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 03:25:01 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 03:25:01 +0000 |
| commit | 9a7656ecaaa0e999ea3465dc1cc108bf4e1cbdc1 (patch) | |
| tree | b965647c5feb412ab0e60438e54a57d46c6f6bca /ash | |
| parent | 8804c1b397f6d474777e763b4d6c2b7e4e81fee1 (diff) | |
| download | chromium_src-9a7656ecaaa0e999ea3465dc1cc108bf4e1cbdc1.zip chromium_src-9a7656ecaaa0e999ea3465dc1cc108bf4e1cbdc1.tar.gz chromium_src-9a7656ecaaa0e999ea3465dc1cc108bf4e1cbdc1.tar.bz2 | |
Aura: Fix Alt-tab not working to cycle windows
The window cycler was trying to check for open modal windows (which should block cycling). Instead it blocked cycling when any "always on top" window was open, which is the wrong type to check for modal windows.
BUG=110444
TEST=Open alert with javascript:alert('hello') then hit Alt-tab. Windows should not cycle. Also updated unit test WindowCycleControllerTest.
Review URL: http://codereview.chromium.org/9242028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 2 | ||||
| -rw-r--r-- | ash/wm/window_cycle_controller_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 54d9887..f43a2c9 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -395,7 +395,7 @@ bool Shell::IsScreenLocked() const { bool Shell::IsModalWindowOpen() const { aura::Window* modal_container = ash::Shell::GetInstance()->GetContainer( - internal::kShellWindowId_AlwaysOnTopContainer); + internal::kShellWindowId_ModalContainer); return !modal_container->children().empty(); } diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc index 0a2681d..0af6a70 100644 --- a/ash/wm/window_cycle_controller_unittest.cc +++ b/ash/wm/window_cycle_controller_unittest.cc @@ -154,7 +154,7 @@ TEST_F(WindowCycleControllerTest, HandleCycleWindow) { // When a modal window is active, cycling window does not take effect. aura::Window* modal_container = ash::Shell::GetInstance()->GetContainer( - internal::kShellWindowId_AlwaysOnTopContainer); + internal::kShellWindowId_ModalContainer); scoped_ptr<Window> modal_window( CreateTestWindowWithId(-2, modal_container)); ActivateWindow(modal_window.get()); |