OLD | NEW |
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 "ash/wm/window_positioner.h" | 5 #include "ash/wm/window_positioner.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "ash/scoped_root_window_for_new_windows.h" | 9 #include "ash/scoped_root_window_for_new_windows.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "ash/shell/toplevel_window.h" | 11 #include "ash/shell/toplevel_window.h" |
12 #include "ash/shell_port.h" | 12 #include "ash/shell_port.h" |
13 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
14 #include "ash/test/test_shell_delegate.h" | 14 #include "ash/test/test_shell_delegate.h" |
15 #include "ash/wm/window_positioner.h" | 15 #include "ash/wm/window_positioner.h" |
16 #include "ash/wm/window_state.h" | 16 #include "ash/wm/window_state.h" |
17 #include "ash/wm_window.h" | |
18 #include "base/strings/string_number_conversions.h" | 17 #include "base/strings/string_number_conversions.h" |
19 #include "ui/display/screen.h" | 18 #include "ui/display/screen.h" |
20 #include "ui/views/widget/widget.h" | 19 #include "ui/views/widget/widget.h" |
21 #include "ui/views/widget/widget_delegate.h" | 20 #include "ui/views/widget/widget_delegate.h" |
22 | 21 |
23 namespace ash { | 22 namespace ash { |
24 | 23 |
25 using WindowPositionerTest = test::AshTestBase; | 24 using WindowPositionerTest = test::AshTestBase; |
26 | 25 |
27 TEST_F(WindowPositionerTest, OpenMaximizedWindowOnSecondDisplay) { | 26 TEST_F(WindowPositionerTest, OpenMaximizedWindowOnSecondDisplay) { |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
203 widget1->SetFullscreen(false); | 202 widget1->SetFullscreen(false); |
204 ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString()); | 203 ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString()); |
205 | 204 |
206 // Closing 2nd widget triggers the rearrange logic but the 1st | 205 // Closing 2nd widget triggers the rearrange logic but the 1st |
207 // widget should stay in the current size. | 206 // widget should stay in the current size. |
208 widget2->CloseNow(); | 207 widget2->CloseNow(); |
209 ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString()); | 208 ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString()); |
210 } | 209 } |
211 | 210 |
212 } // namespace ash | 211 } // namespace ash |
OLD | NEW |