| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/screen_util.h" | 5 #include "ash/screen_util.h" |
| 6 | 6 |
| 7 #include "ash/common/wm/wm_screen_util.h" | |
| 8 #include "ash/common/wm_shell.h" | |
| 9 #include "ash/common/wm_window.h" | |
| 10 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 11 #include "ash/test/ash_test_base.h" | 8 #include "ash/test/ash_test_base.h" |
| 12 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
| 10 #include "ash/wm/wm_screen_util.h" |
| 11 #include "ash/wm_shell.h" |
| 12 #include "ash/wm_window.h" |
| 13 #include "ui/aura/env.h" | 13 #include "ui/aura/env.h" |
| 14 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
| 15 #include "ui/aura/window_event_dispatcher.h" | 15 #include "ui/aura/window_event_dispatcher.h" |
| 16 #include "ui/display/manager/display_manager.h" | 16 #include "ui/display/manager/display_manager.h" |
| 17 #include "ui/views/widget/widget.h" | 17 #include "ui/views/widget/widget.h" |
| 18 #include "ui/views/widget/widget_delegate.h" | 18 #include "ui/views/widget/widget_delegate.h" |
| 19 #include "ui/wm/core/coordinate_conversion.h" | 19 #include "ui/wm/core/coordinate_conversion.h" |
| 20 | 20 |
| 21 namespace ash { | 21 namespace ash { |
| 22 namespace test { | 22 namespace test { |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 ASSERT_EQ("800,0 100x100", widget->GetWindowBoundsInScreen().ToString()); | 127 ASSERT_EQ("800,0 100x100", widget->GetWindowBoundsInScreen().ToString()); |
| 128 | 128 |
| 129 EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString()); | 129 EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString()); |
| 130 | 130 |
| 131 UpdateDisplay("600x500"); | 131 UpdateDisplay("600x500"); |
| 132 EXPECT_EQ("0,0 600x500", wm::GetDisplayBoundsWithShelf(window).ToString()); | 132 EXPECT_EQ("0,0 600x500", wm::GetDisplayBoundsWithShelf(window).ToString()); |
| 133 } | 133 } |
| 134 | 134 |
| 135 } // namespace test | 135 } // namespace test |
| 136 } // namespace ash | 136 } // namespace ash |
| OLD | NEW |