Index: ash/accelerators/accelerator_controller_unittest.cc |
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc |
index ab3ec88e63d0c670aad84c9852b3799653316374..4fecc24d5b4c18d70b09ef9d15994207e3ee0b43 100644 |
--- a/ash/accelerators/accelerator_controller_unittest.cc |
+++ b/ash/accelerators/accelerator_controller_unittest.cc |
@@ -1230,18 +1230,20 @@ TEST_F(AcceleratorControllerTest, DisallowedWithNoWindow) { |
} |
// Make sure we don't alert if we do have a window. |
- scoped_ptr<aura::Window> window( |
- CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20))); |
- wm::ActivateWindow(window.get()); |
+ scoped_ptr<aura::Window> window; |
for (size_t i = 0; i < kActionsNeedingWindowLength; ++i) { |
+ window.reset(CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20))); |
Nina
2014/07/04 20:51:10
This is to avoid calling "minimize" on a window i
oshima
2014/07/07 23:30:57
Requesting minimize in overview mode should not ca
|
+ wm::ActivateWindow(window.get()); |
delegate->TriggerAccessibilityAlert(A11Y_ALERT_NONE); |
GetController()->PerformAction(kActionsNeedingWindow[i], dummy); |
EXPECT_NE(delegate->GetLastAccessibilityAlert(), A11Y_ALERT_WINDOW_NEEDED); |
} |
// Don't alert if we have a minimized window either. |
- GetController()->PerformAction(WINDOW_MINIMIZE, dummy); |
for (size_t i = 0; i < kActionsNeedingWindowLength; ++i) { |
+ window.reset(CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20))); |
+ wm::ActivateWindow(window.get()); |
+ GetController()->PerformAction(WINDOW_MINIMIZE, dummy); |
delegate->TriggerAccessibilityAlert(A11Y_ALERT_NONE); |
GetController()->PerformAction(kActionsNeedingWindow[i], dummy); |
EXPECT_NE(delegate->GetLastAccessibilityAlert(), A11Y_ALERT_WINDOW_NEEDED); |