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_controller.h" | 9 #include "ash/common/session/session_controller.h" |
10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
11 #include "ash/common/system/tray/system_tray_delegate.h" | |
12 #include "ash/common/wm/system_modal_container_layout_manager.h" | 11 #include "ash/common/wm/system_modal_container_layout_manager.h" |
13 #include "ash/common/wm/window_state.h" | 12 #include "ash/common/wm/window_state.h" |
14 #include "ash/common/wm_shell.h" | 13 #include "ash/common/wm_shell.h" |
15 #include "ash/common/wm_window.h" | 14 #include "ash/common/wm_window.h" |
16 #include "ash/public/cpp/shell_window_ids.h" | 15 #include "ash/public/cpp/shell_window_ids.h" |
17 #include "ash/shell.h" | 16 #include "ash/shell.h" |
| 17 #include "ash/system/tray/system_tray_delegate.h" |
18 #include "ash/test/ash_test_base.h" | 18 #include "ash/test/ash_test_base.h" |
19 #include "ash/wm/window_properties.h" | 19 #include "ash/wm/window_properties.h" |
20 #include "ash/wm/window_state_aura.h" | 20 #include "ash/wm/window_state_aura.h" |
21 #include "ash/wm/window_util.h" | 21 #include "ash/wm/window_util.h" |
22 #include "base/command_line.h" | 22 #include "base/command_line.h" |
23 #include "ui/aura/client/focus_change_observer.h" | 23 #include "ui/aura/client/focus_change_observer.h" |
24 #include "ui/aura/client/focus_client.h" | 24 #include "ui/aura/client/focus_client.h" |
25 #include "ui/aura/client/window_parenting_client.h" | 25 #include "ui/aura/client/window_parenting_client.h" |
26 #include "ui/aura/env.h" | 26 #include "ui/aura/env.h" |
27 #include "ui/aura/test/test_window_delegate.h" | 27 #include "ui/aura/test/test_window_delegate.h" |
(...skipping 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1238 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( | 1238 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( |
1239 gfx::Rect(0, 400, 800, 200)); | 1239 gfx::Rect(0, 400, 800, 200)); |
1240 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); | 1240 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); |
1241 | 1241 |
1242 UpdateDisplay("600x800"); | 1242 UpdateDisplay("600x800"); |
1243 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); | 1243 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); |
1244 } | 1244 } |
1245 | 1245 |
1246 } // namespace test | 1246 } // namespace test |
1247 } // namespace ash | 1247 } // namespace ash |
OLD | NEW |