| 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/screen_util.h" | 7 #include "ash/screen_util.h" |
| 8 #include "ash/test/ash_test_base.h" | 8 #include "ash/test/ash_test_base.h" |
| 9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
| 10 #include "ash/wm/window_state_aura.h" |
| 10 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 11 | 12 |
| 12 namespace ash { | 13 namespace ash { |
| 13 | 14 |
| 14 namespace { | 15 namespace { |
| 15 | 16 |
| 16 std::string GetAdjustedBounds(const gfx::Rect& visible, | 17 std::string GetAdjustedBounds(const gfx::Rect& visible, |
| 17 gfx::Rect to_be_adjusted) { | 18 gfx::Rect to_be_adjusted) { |
| 18 wm::AdjustBoundsToEnsureMinimumWindowVisibility(visible, &to_be_adjusted); | 19 wm::AdjustBoundsToEnsureMinimumWindowVisibility(visible, &to_be_adjusted); |
| 19 return to_be_adjusted.ToString(); | 20 return to_be_adjusted.ToString(); |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 "-250,-40 100x100", | 88 "-250,-40 100x100", |
| 88 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-250, -40, 150, 150))); | 89 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-250, -40, 150, 150))); |
| 89 EXPECT_EQ( | 90 EXPECT_EQ( |
| 90 "-275,-50 100x100", | 91 "-275,-50 100x100", |
| 91 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-400, -60, 150, 150))); | 92 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-400, -60, 150, 150))); |
| 92 EXPECT_EQ("-125,0 100x100", | 93 EXPECT_EQ("-125,0 100x100", |
| 93 GetAdjustedBounds(visible_bounds_left, gfx::Rect(0, 0, 150, 150))); | 94 GetAdjustedBounds(visible_bounds_left, gfx::Rect(0, 0, 150, 150))); |
| 94 } | 95 } |
| 95 | 96 |
| 96 } // namespace ash | 97 } // namespace ash |
| OLD | NEW |