OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/root_window_controller.h" | 5 #include "ash/root_window_controller.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
| 9 #include "ash/common/session/session_state_delegate.h" |
9 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
10 #include "ash/common/wm/window_state.h" | 11 #include "ash/common/wm/window_state.h" |
11 #include "ash/display/display_manager.h" | 12 #include "ash/display/display_manager.h" |
12 #include "ash/session/session_state_delegate.h" | |
13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
14 #include "ash/system/tray/system_tray_delegate.h" | 14 #include "ash/system/tray/system_tray_delegate.h" |
15 #include "ash/test/ash_test_base.h" | 15 #include "ash/test/ash_test_base.h" |
16 #include "ash/test/display_manager_test_api.h" | 16 #include "ash/test/display_manager_test_api.h" |
17 #include "ash/wm/system_modal_container_layout_manager.h" | 17 #include "ash/wm/system_modal_container_layout_manager.h" |
18 #include "ash/wm/window_properties.h" | 18 #include "ash/wm/window_properties.h" |
19 #include "ash/wm/window_state_aura.h" | 19 #include "ash/wm/window_state_aura.h" |
20 #include "ash/wm/window_util.h" | 20 #include "ash/wm/window_util.h" |
21 #include "base/command_line.h" | 21 #include "base/command_line.h" |
22 #include "ui/aura/client/focus_change_observer.h" | 22 #include "ui/aura/client/focus_change_observer.h" |
(...skipping 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1043 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( | 1043 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( |
1044 gfx::Rect(0, 400, 800, 200)); | 1044 gfx::Rect(0, 400, 800, 200)); |
1045 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); | 1045 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); |
1046 | 1046 |
1047 UpdateDisplay("600x800"); | 1047 UpdateDisplay("600x800"); |
1048 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); | 1048 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); |
1049 } | 1049 } |
1050 | 1050 |
1051 } // namespace test | 1051 } // namespace test |
1052 } // namespace ash | 1052 } // namespace ash |
OLD | NEW |