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/aura/wm_window_aura.h" | 9 #include "ash/aura/wm_window_aura.h" |
10 #include "ash/common/material_design/material_design_controller.h" | 10 #include "ash/common/material_design/material_design_controller.h" |
11 #include "ash/common/session/session_state_delegate.h" | 11 #include "ash/common/session/session_state_delegate.h" |
12 #include "ash/common/shell_window_ids.h" | |
13 #include "ash/common/system/tray/system_tray_delegate.h" | 12 #include "ash/common/system/tray/system_tray_delegate.h" |
14 #include "ash/common/wm/system_modal_container_layout_manager.h" | 13 #include "ash/common/wm/system_modal_container_layout_manager.h" |
15 #include "ash/common/wm/window_state.h" | 14 #include "ash/common/wm/window_state.h" |
16 #include "ash/common/wm_lookup.h" | 15 #include "ash/common/wm_lookup.h" |
17 #include "ash/common/wm_root_window_controller.h" | 16 #include "ash/common/wm_root_window_controller.h" |
18 #include "ash/common/wm_shell.h" | 17 #include "ash/common/wm_shell.h" |
19 #include "ash/common/wm_window.h" | 18 #include "ash/common/wm_window.h" |
20 #include "ash/display/display_manager.h" | 19 #include "ash/display/display_manager.h" |
| 20 #include "ash/public/cpp/shell_window_ids.h" |
21 #include "ash/shell.h" | 21 #include "ash/shell.h" |
22 #include "ash/test/ash_md_test_base.h" | 22 #include "ash/test/ash_md_test_base.h" |
23 #include "ash/test/ash_test_base.h" | 23 #include "ash/test/ash_test_base.h" |
24 #include "ash/test/display_manager_test_api.h" | 24 #include "ash/test/display_manager_test_api.h" |
25 #include "ash/wm/window_properties.h" | 25 #include "ash/wm/window_properties.h" |
26 #include "ash/wm/window_state_aura.h" | 26 #include "ash/wm/window_state_aura.h" |
27 #include "ash/wm/window_util.h" | 27 #include "ash/wm/window_util.h" |
28 #include "base/command_line.h" | 28 #include "base/command_line.h" |
29 #include "ui/aura/client/focus_change_observer.h" | 29 #include "ui/aura/client/focus_change_observer.h" |
30 #include "ui/aura/client/focus_client.h" | 30 #include "ui/aura/client/focus_client.h" |
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1033 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( | 1033 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( |
1034 gfx::Rect(0, 400, 800, 200)); | 1034 gfx::Rect(0, 400, 800, 200)); |
1035 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); | 1035 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); |
1036 | 1036 |
1037 UpdateDisplay("600x800"); | 1037 UpdateDisplay("600x800"); |
1038 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); | 1038 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); |
1039 } | 1039 } |
1040 | 1040 |
1041 } // namespace test | 1041 } // namespace test |
1042 } // namespace ash | 1042 } // namespace ash |
OLD | NEW |