summaryrefslogtreecommitdiffstats
path: root/ash/extended_desktop_unittest.cc
diff options
context:
space:
mode:
authorflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 21:12:50 +0000
committerflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 21:12:50 +0000
commitfba1eb214a613eefad7dde40eefbb50a12320a45 (patch)
treefde1d915c2ac20555f08e849e784c22c9f6add20 /ash/extended_desktop_unittest.cc
parent835c1511386275bdcefb7ef140761f92aea972fb (diff)
downloadchromium_src-fba1eb214a613eefad7dde40eefbb50a12320a45.zip
chromium_src-fba1eb214a613eefad7dde40eefbb50a12320a45.tar.gz
chromium_src-fba1eb214a613eefad7dde40eefbb50a12320a45.tar.bz2
Remove --ash-disable-overview-mode
BUG=340466 Review URL: https://codereview.chromium.org/181563004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/extended_desktop_unittest.cc')
-rw-r--r--ash/extended_desktop_unittest.cc52
1 files changed, 0 insertions, 52 deletions
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index dbab079..d0f3f2c 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;