| OLD | NEW |
| 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/aura/wm_window_aura.h" | |
| 8 #include "ash/common/wm/window_positioning_utils.h" | 7 #include "ash/common/wm/window_positioning_utils.h" |
| 9 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.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 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 30 if (!SupportsMultipleDisplays()) | 30 if (!SupportsMultipleDisplays()) |
| 31 return; | 31 return; |
| 32 | 32 |
| 33 UpdateDisplay("500x400, 600x400"); | 33 UpdateDisplay("500x400, 600x400"); |
| 34 std::unique_ptr<aura::Window> window( | 34 std::unique_ptr<aura::Window> window( |
| 35 CreateTestWindowInShellWithBounds(gfx::Rect(12, 20, 100, 100))); | 35 CreateTestWindowInShellWithBounds(gfx::Rect(12, 20, 100, 100))); |
| 36 | 36 |
| 37 wm::WindowState* window_state = wm::GetWindowState(window.get()); | 37 wm::WindowState* window_state = wm::GetWindowState(window.get()); |
| 38 EXPECT_FALSE(window_state->bounds_changed_by_user()); | 38 EXPECT_FALSE(window_state->bounds_changed_by_user()); |
| 39 | 39 |
| 40 wm::CenterWindow(WmWindowAura::Get(window.get())); | 40 wm::CenterWindow(WmWindow::Get(window.get())); |
| 41 // Centring window is considered as a user's action. | 41 // Centring window is considered as a user's action. |
| 42 EXPECT_TRUE(window_state->bounds_changed_by_user()); | 42 EXPECT_TRUE(window_state->bounds_changed_by_user()); |
| 43 EXPECT_EQ("200,126 100x100", window->bounds().ToString()); | 43 EXPECT_EQ("200,126 100x100", window->bounds().ToString()); |
| 44 EXPECT_EQ("200,126 100x100", window->GetBoundsInScreen().ToString()); | 44 EXPECT_EQ("200,126 100x100", window->GetBoundsInScreen().ToString()); |
| 45 window->SetBoundsInScreen(gfx::Rect(600, 0, 100, 100), | 45 window->SetBoundsInScreen(gfx::Rect(600, 0, 100, 100), |
| 46 display_manager()->GetSecondaryDisplay()); | 46 display_manager()->GetSecondaryDisplay()); |
| 47 wm::CenterWindow(WmWindowAura::Get(window.get())); | 47 wm::CenterWindow(WmWindow::Get(window.get())); |
| 48 EXPECT_EQ("250,126 100x100", window->bounds().ToString()); | 48 EXPECT_EQ("250,126 100x100", window->bounds().ToString()); |
| 49 EXPECT_EQ("750,126 100x100", window->GetBoundsInScreen().ToString()); | 49 EXPECT_EQ("750,126 100x100", window->GetBoundsInScreen().ToString()); |
| 50 } | 50 } |
| 51 | 51 |
| 52 TEST_F(WindowUtilTest, AdjustBoundsToEnsureMinimumVisibility) { | 52 TEST_F(WindowUtilTest, AdjustBoundsToEnsureMinimumVisibility) { |
| 53 const gfx::Rect visible_bounds(0, 0, 100, 100); | 53 const gfx::Rect visible_bounds(0, 0, 100, 100); |
| 54 | 54 |
| 55 EXPECT_EQ("0,0 90x90", | 55 EXPECT_EQ("0,0 90x90", |
| 56 GetAdjustedBounds(visible_bounds, gfx::Rect(0, 0, 90, 90))); | 56 GetAdjustedBounds(visible_bounds, gfx::Rect(0, 0, 90, 90))); |
| 57 EXPECT_EQ("0,0 100x100", | 57 EXPECT_EQ("0,0 100x100", |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 "-250,-40 100x100", | 106 "-250,-40 100x100", |
| 107 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-250, -40, 150, 150))); | 107 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-250, -40, 150, 150))); |
| 108 EXPECT_EQ( | 108 EXPECT_EQ( |
| 109 "-275,-50 100x100", | 109 "-275,-50 100x100", |
| 110 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-400, -60, 150, 150))); | 110 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-400, -60, 150, 150))); |
| 111 EXPECT_EQ("-125,0 100x100", | 111 EXPECT_EQ("-125,0 100x100", |
| 112 GetAdjustedBounds(visible_bounds_left, gfx::Rect(0, 0, 150, 150))); | 112 GetAdjustedBounds(visible_bounds_left, gfx::Rect(0, 0, 150, 150))); |
| 113 } | 113 } |
| 114 | 114 |
| 115 } // namespace ash | 115 } // namespace ash |
| OLD | NEW |