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

Side by Side Diff: ash/wm/overview/window_selector_unittest.cc

Issue 2732573002: chromeos: moves more ash tests to run on mash (Closed)
Patch Set: fix bug ref Created 3 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 unified diff | Download patch
OLDNEW
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 #include <vector> 6 #include <vector>
7 7
8 #include "ash/common/accessibility_delegate.h" 8 #include "ash/common/accessibility_delegate.h"
9 #include "ash/common/accessibility_types.h" 9 #include "ash/common/accessibility_types.h"
10 #include "ash/common/ash_switches.h" 10 #include "ash/common/ash_switches.h"
(...skipping 1703 matching lines...) Expand 10 before | Expand all | Expand 10 after
1714 EXPECT_EQ(GetSelectedWindow(), 1714 EXPECT_EQ(GetSelectedWindow(),
1715 WmWindow::GetAuraWindow(overview_root2[0]->GetWindow())); 1715 WmWindow::GetAuraWindow(overview_root2[0]->GetWindow()));
1716 SendKey(ui::VKEY_RIGHT); 1716 SendKey(ui::VKEY_RIGHT);
1717 EXPECT_EQ(GetSelectedWindow(), 1717 EXPECT_EQ(GetSelectedWindow(),
1718 WmWindow::GetAuraWindow(overview_root2[1]->GetWindow())); 1718 WmWindow::GetAuraWindow(overview_root2[1]->GetWindow()));
1719 } 1719 }
1720 1720
1721 // Tests first monitor when display order doesn't match left to right screen 1721 // Tests first monitor when display order doesn't match left to right screen
1722 // positions. 1722 // positions.
1723 TEST_F(WindowSelectorTest, MultiMonitorReversedOrder) { 1723 TEST_F(WindowSelectorTest, MultiMonitorReversedOrder) {
1724 // TODO: SetLayoutForCurrentDisplays() needs to ported to mash.
1725 // http://crbug.com/698043.
1726 if (WmShell::Get()->IsRunningInMash())
1727 return;
1728
1724 UpdateDisplay("400x400,400x400"); 1729 UpdateDisplay("400x400,400x400");
1725 Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays( 1730 Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
1726 display::test::CreateDisplayLayout(display_manager(), 1731 display::test::CreateDisplayLayout(display_manager(),
1727 display::DisplayPlacement::LEFT, 0)); 1732 display::DisplayPlacement::LEFT, 0));
1728 aura::Window::Windows root_windows = Shell::GetAllRootWindows(); 1733 aura::Window::Windows root_windows = Shell::GetAllRootWindows();
1729 gfx::Rect bounds1(-350, 0, 100, 100); 1734 gfx::Rect bounds1(-350, 0, 100, 100);
1730 gfx::Rect bounds2(0, 0, 100, 100); 1735 gfx::Rect bounds2(0, 0, 100, 100);
1731 std::unique_ptr<aura::Window> window2(CreateWindow(bounds2)); 1736 std::unique_ptr<aura::Window> window2(CreateWindow(bounds2));
1732 std::unique_ptr<aura::Window> window1(CreateWindow(bounds1)); 1737 std::unique_ptr<aura::Window> window1(CreateWindow(bounds1));
1733 EXPECT_EQ(root_windows[1], window1->GetRootWindow()); 1738 EXPECT_EQ(root_windows[1], window1->GetRootWindow());
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
2128 aura::client::WINDOW_MOVE_SOURCE_MOUSE)); 2133 aura::client::WINDOW_MOVE_SOURCE_MOUSE));
2129 ASSERT_TRUE(resizer.get()); 2134 ASSERT_TRUE(resizer.get());
2130 gfx::Point location = resizer->GetInitialLocation(); 2135 gfx::Point location = resizer->GetInitialLocation();
2131 location.Offset(20, 20); 2136 location.Offset(20, 20);
2132 resizer->Drag(location, 0); 2137 resizer->Drag(location, 0);
2133 ToggleOverview(); 2138 ToggleOverview();
2134 resizer->RevertDrag(); 2139 resizer->RevertDrag();
2135 } 2140 }
2136 2141
2137 } // namespace ash 2142 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc ('k') | ash/wm/toplevel_window_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698