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

Side by Side Diff: ash/wm/window_util_unittest.cc

Issue 2653593004: chromeos: Remove AshTestBase::SupportsMultipleDisplays (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « ash/wm/window_state_unittest.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "ash/wm/window_util.h" 5 #include "ash/wm/window_util.h"
6 6
7 #include "ash/common/wm/window_positioning_utils.h" 7 #include "ash/common/wm/window_positioning_utils.h"
8 #include "ash/common/wm/window_state.h" 8 #include "ash/common/wm/window_state.h"
9 #include "ash/common/wm_window.h" 9 #include "ash/common/wm_window.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 #include "ash/wm/window_state_aura.h" 11 #include "ash/wm/window_state_aura.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/display/manager/display_manager.h" 13 #include "ui/display/manager/display_manager.h"
14 #include "ui/display/screen.h" 14 #include "ui/display/screen.h"
15 15
16 namespace ash { 16 namespace ash {
17 17
18 namespace { 18 namespace {
19 19
20 std::string GetAdjustedBounds(const gfx::Rect& visible, 20 std::string GetAdjustedBounds(const gfx::Rect& visible,
21 gfx::Rect to_be_adjusted) { 21 gfx::Rect to_be_adjusted) {
22 wm::AdjustBoundsToEnsureMinimumWindowVisibility(visible, &to_be_adjusted); 22 wm::AdjustBoundsToEnsureMinimumWindowVisibility(visible, &to_be_adjusted);
23 return to_be_adjusted.ToString(); 23 return to_be_adjusted.ToString();
24 } 24 }
25 } 25 }
26 26
27 typedef test::AshTestBase WindowUtilTest; 27 typedef test::AshTestBase WindowUtilTest;
28 28
29 TEST_F(WindowUtilTest, CenterWindow) { 29 TEST_F(WindowUtilTest, CenterWindow) {
30 if (!SupportsMultipleDisplays())
31 return;
32
33 UpdateDisplay("500x400, 600x400"); 30 UpdateDisplay("500x400, 600x400");
34 std::unique_ptr<aura::Window> window( 31 std::unique_ptr<aura::Window> window(
35 CreateTestWindowInShellWithBounds(gfx::Rect(12, 20, 100, 100))); 32 CreateTestWindowInShellWithBounds(gfx::Rect(12, 20, 100, 100)));
36 33
37 wm::WindowState* window_state = wm::GetWindowState(window.get()); 34 wm::WindowState* window_state = wm::GetWindowState(window.get());
38 EXPECT_FALSE(window_state->bounds_changed_by_user()); 35 EXPECT_FALSE(window_state->bounds_changed_by_user());
39 36
40 wm::CenterWindow(WmWindow::Get(window.get())); 37 wm::CenterWindow(WmWindow::Get(window.get()));
41 // Centring window is considered as a user's action. 38 // Centring window is considered as a user's action.
42 EXPECT_TRUE(window_state->bounds_changed_by_user()); 39 EXPECT_TRUE(window_state->bounds_changed_by_user());
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 "-250,-40 100x100", 103 "-250,-40 100x100",
107 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-250, -40, 150, 150))); 104 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-250, -40, 150, 150)));
108 EXPECT_EQ( 105 EXPECT_EQ(
109 "-275,-50 100x100", 106 "-275,-50 100x100",
110 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-400, -60, 150, 150))); 107 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-400, -60, 150, 150)));
111 EXPECT_EQ("-125,0 100x100", 108 EXPECT_EQ("-125,0 100x100",
112 GetAdjustedBounds(visible_bounds_left, gfx::Rect(0, 0, 150, 150))); 109 GetAdjustedBounds(visible_bounds_left, gfx::Rect(0, 0, 150, 150)));
113 } 110 }
114 111
115 } // namespace ash 112 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_state_unittest.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698