| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <algorithm> | 5 #include <algorithm> |
| 6 | 6 |
| 7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
| 8 #include "ash/drag_drop/drag_drop_controller.h" | 8 #include "ash/drag_drop/drag_drop_controller.h" |
| 9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/screen_util.h" | 10 #include "ash/screen_util.h" |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 EXPECT_FALSE(shelf->GetDimsShelf()); | 432 EXPECT_FALSE(shelf->GetDimsShelf()); |
| 433 ToggleOverview(); | 433 ToggleOverview(); |
| 434 EXPECT_TRUE(shelf->GetDimsShelf()); | 434 EXPECT_TRUE(shelf->GetDimsShelf()); |
| 435 } | 435 } |
| 436 | 436 |
| 437 // Tests that beginning window selection hides the app list. | 437 // Tests that beginning window selection hides the app list. |
| 438 TEST_F(WindowSelectorTest, SelectingHidesAppList) { | 438 TEST_F(WindowSelectorTest, SelectingHidesAppList) { |
| 439 gfx::Rect bounds(0, 0, 400, 400); | 439 gfx::Rect bounds(0, 0, 400, 400); |
| 440 scoped_ptr<aura::Window> window1(CreateWindow(bounds)); | 440 scoped_ptr<aura::Window> window1(CreateWindow(bounds)); |
| 441 scoped_ptr<aura::Window> window2(CreateWindow(bounds)); | 441 scoped_ptr<aura::Window> window2(CreateWindow(bounds)); |
| 442 Shell::GetInstance()->ToggleAppList(NULL); | 442 Shell::GetInstance()->ShowAppList(NULL); |
| 443 EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); | 443 EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); |
| 444 ToggleOverview(); | 444 ToggleOverview(); |
| 445 EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility()); | 445 EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility()); |
| 446 ToggleOverview(); | 446 ToggleOverview(); |
| 447 } | 447 } |
| 448 | 448 |
| 449 // Tests that a minimized window's visibility and layer visibility is correctly | 449 // Tests that a minimized window's visibility and layer visibility is correctly |
| 450 // changed when entering overview and restored when leaving overview mode. | 450 // changed when entering overview and restored when leaving overview mode. |
| 451 // Crashes after the skia roll in http://crrev.com/274114. | 451 // Crashes after the skia roll in http://crrev.com/274114. |
| 452 // http://crbug.com/379570 | 452 // http://crbug.com/379570 |
| (...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1132 // Dimming all the items should hide the selection widget. | 1132 // Dimming all the items should hide the selection widget. |
| 1133 FilterItems("Pop"); | 1133 FilterItems("Pop"); |
| 1134 EXPECT_FALSE(selection_widget_active()); | 1134 EXPECT_FALSE(selection_widget_active()); |
| 1135 | 1135 |
| 1136 // Undimming one window should automatically select it. | 1136 // Undimming one window should automatically select it. |
| 1137 FilterItems("Rock and roll"); | 1137 FilterItems("Rock and roll"); |
| 1138 EXPECT_EQ(GetSelectedWindow(), window2.get()); | 1138 EXPECT_EQ(GetSelectedWindow(), window2.get()); |
| 1139 } | 1139 } |
| 1140 | 1140 |
| 1141 } // namespace ash | 1141 } // namespace ash |
| OLD | NEW |