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" | 7 #include "ash/aura/wm_window_aura.h" |
8 #include "ash/common/wm/window_positioning_utils.h" | 8 #include "ash/common/wm/window_positioning_utils.h" |
9 #include "ash/common/wm/window_state.h" | 9 #include "ash/common/wm/window_state.h" |
10 #include "ash/display/display_manager.h" | |
11 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
12 #include "ash/wm/window_state_aura.h" | 11 #include "ash/wm/window_state_aura.h" |
13 #include "ui/aura/window.h" | 12 #include "ui/aura/window.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(); |
(...skipping 82 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 |