Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: ash/extended_desktop_unittest.cc

Issue 181563004: Remove --ash-disable-overview-mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/focus_cycler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index dbab0792c767f8af3c5638ada5a5b0ae229d6ad2..d0f3f2ceb905606abc915b7b195135c170b8cfdd 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -11,7 +11,6 @@
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/coordinate_conversion.h"
-#include "ash/wm/window_cycle_controller.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
#include "base/strings/string_util.h"
@@ -284,57 +283,6 @@ TEST_F(ExtendedDesktopTest, TestCursorLocation) {
EXPECT_FALSE(root_window1_test_api.ContainsMouse());
}
-TEST_F(ExtendedDesktopTest, CycleWindows) {
- if (!SupportsMultipleDisplays())
- return;
-
- UpdateDisplay("700x500,500x500");
- aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-
- WindowCycleController* controller =
- Shell::GetInstance()->window_cycle_controller();
-
- views::Widget* d1_w1 = CreateTestWidget(gfx::Rect(10, 10, 100, 100));
- EXPECT_EQ(root_windows[0], d1_w1->GetNativeView()->GetRootWindow());
- views::Widget* d2_w1 = CreateTestWidget(gfx::Rect(800, 10, 100, 100));
- EXPECT_EQ(root_windows[1], d2_w1->GetNativeView()->GetRootWindow());
- EXPECT_TRUE(wm::IsActiveWindow(d2_w1->GetNativeView()));
-
- controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
- EXPECT_TRUE(wm::IsActiveWindow(d1_w1->GetNativeView()));
- controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
- EXPECT_TRUE(wm::IsActiveWindow(d2_w1->GetNativeView()));
- controller->HandleCycleWindow(WindowCycleController::BACKWARD, false);
- EXPECT_TRUE(wm::IsActiveWindow(d1_w1->GetNativeView()));
- controller->HandleCycleWindow(WindowCycleController::BACKWARD, false);
- EXPECT_TRUE(wm::IsActiveWindow(d2_w1->GetNativeView()));
-
- // Cycle through all windows across root windows.
- views::Widget* d1_w2 = CreateTestWidget(gfx::Rect(10, 200, 100, 100));
- EXPECT_EQ(root_windows[0], d1_w2->GetNativeView()->GetRootWindow());
- views::Widget* d2_w2 = CreateTestWidget(gfx::Rect(800, 200, 100, 100));
- EXPECT_EQ(root_windows[1], d2_w2->GetNativeView()->GetRootWindow());
-
- controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
- EXPECT_TRUE(wm::IsActiveWindow(d1_w2->GetNativeView()));
- controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
- EXPECT_TRUE(wm::IsActiveWindow(d2_w1->GetNativeView()));
- controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
- EXPECT_TRUE(wm::IsActiveWindow(d1_w1->GetNativeView()));
- controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
- EXPECT_TRUE(wm::IsActiveWindow(d2_w2->GetNativeView()));
-
- // Backwards
- controller->HandleCycleWindow(WindowCycleController::BACKWARD, true);
- EXPECT_TRUE(wm::IsActiveWindow(d1_w1->GetNativeView()));
- controller->HandleCycleWindow(WindowCycleController::BACKWARD, true);
- EXPECT_TRUE(wm::IsActiveWindow(d2_w1->GetNativeView()));
- controller->HandleCycleWindow(WindowCycleController::BACKWARD, true);
- EXPECT_TRUE(wm::IsActiveWindow(d1_w2->GetNativeView()));
- controller->HandleCycleWindow(WindowCycleController::BACKWARD, true);
- EXPECT_TRUE(wm::IsActiveWindow(d2_w2->GetNativeView()));
-}
-
TEST_F(ExtendedDesktopTest, GetRootWindowAt) {
if (!SupportsMultipleDisplays())
return;
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/focus_cycler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698