| 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/shell_window_ids.h" |
| 9 #include "ash/common/wm/window_state.h" | 10 #include "ash/common/wm/window_state.h" |
| 10 #include "ash/display/display_manager.h" | 11 #include "ash/display/display_manager.h" |
| 11 #include "ash/session/session_state_delegate.h" | 12 #include "ash/session/session_state_delegate.h" |
| 12 #include "ash/shelf/shelf_layout_manager.h" | 13 #include "ash/shelf/shelf_layout_manager.h" |
| 13 #include "ash/shell.h" | 14 #include "ash/shell.h" |
| 14 #include "ash/shell_window_ids.h" | |
| 15 #include "ash/system/tray/system_tray_delegate.h" | 15 #include "ash/system/tray/system_tray_delegate.h" |
| 16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
| 17 #include "ash/test/display_manager_test_api.h" | 17 #include "ash/test/display_manager_test_api.h" |
| 18 #include "ash/wm/system_modal_container_layout_manager.h" | 18 #include "ash/wm/system_modal_container_layout_manager.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" |
| (...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1049 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( | 1049 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( |
| 1050 gfx::Rect(0, 400, 800, 200)); | 1050 gfx::Rect(0, 400, 800, 200)); |
| 1051 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); | 1051 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); |
| 1052 | 1052 |
| 1053 UpdateDisplay("600x800"); | 1053 UpdateDisplay("600x800"); |
| 1054 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); | 1054 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); |
| 1055 } | 1055 } |
| 1056 | 1056 |
| 1057 } // namespace test | 1057 } // namespace test |
| 1058 } // namespace ash | 1058 } // namespace ash |
| OLD | NEW |