| 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/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell/toplevel_window.h" | 10 #include "ash/shell/toplevel_window.h" |
| 11 #include "ash/test/ash_test_base.h" | 11 #include "ash/test/ash_test_base.h" |
| 12 #include "ash/test/test_shell_delegate.h" | 12 #include "ash/test/test_shell_delegate.h" |
| 13 #include "ash/wm/common/window_state.h" |
| 13 #include "ash/wm/window_positioner.h" | 14 #include "ash/wm/window_positioner.h" |
| 14 #include "ash/wm/window_state.h" | |
| 15 #include "ash/wm/window_state_aura.h" | 15 #include "ash/wm/window_state_aura.h" |
| 16 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
| 17 #include "ui/aura/window_event_dispatcher.h" | 17 #include "ui/aura/window_event_dispatcher.h" |
| 18 #include "ui/gfx/screen.h" | 18 #include "ui/gfx/screen.h" |
| 19 #include "ui/views/widget/widget.h" | 19 #include "ui/views/widget/widget.h" |
| 20 #include "ui/views/widget/widget_delegate.h" | 20 #include "ui/views/widget/widget_delegate.h" |
| 21 | 21 |
| 22 namespace ash { | 22 namespace ash { |
| 23 | 23 |
| 24 typedef test::AshTestBase WindowPositionerTest; | 24 typedef test::AshTestBase WindowPositionerTest; |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 widget1->SetFullscreen(false); | 233 widget1->SetFullscreen(false); |
| 234 ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString()); | 234 ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString()); |
| 235 | 235 |
| 236 // Closing 2nd widget triggers the rearrange logic but the 1st | 236 // Closing 2nd widget triggers the rearrange logic but the 1st |
| 237 // widget should stay in the current size. | 237 // widget should stay in the current size. |
| 238 widget2->CloseNow(); | 238 widget2->CloseNow(); |
| 239 ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString()); | 239 ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString()); |
| 240 } | 240 } |
| 241 | 241 |
| 242 } // namespace ash | 242 } // namespace ash |
| OLD | NEW |