| 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/test/ash_test_base.h" | 5 #include "ash/test/ash_test_base.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/common/test/test_session_state_delegate.h" | 10 #include "ash/common/test/test_session_state_delegate.h" |
| 11 #include "ash/common/test/test_system_tray_delegate.h" | 11 #include "ash/common/test/test_system_tray_delegate.h" |
| 12 #include "ash/common/wm/window_positioner.h" | 12 #include "ash/common/wm/window_positioner.h" |
| 13 #include "ash/common/wm_root_window_controller.h" | 13 #include "ash/common/wm_root_window_controller.h" |
| 14 #include "ash/common/wm_shell.h" | 14 #include "ash/common/wm_shell.h" |
| 15 #include "ash/common/wm_window.h" | 15 #include "ash/common/wm_window.h" |
| 16 #include "ash/display/extended_mouse_warp_controller.h" | 16 #include "ash/display/extended_mouse_warp_controller.h" |
| 17 #include "ash/display/mouse_cursor_event_filter.h" | 17 #include "ash/display/mouse_cursor_event_filter.h" |
| 18 #include "ash/display/unified_mouse_warp_controller.h" | 18 #include "ash/display/unified_mouse_warp_controller.h" |
| 19 #include "ash/display/window_tree_host_manager.h" | 19 #include "ash/display/window_tree_host_manager.h" |
| 20 #include "ash/ime/input_method_event_handler.h" | 20 #include "ash/ime/input_method_event_handler.h" |
| 21 #include "ash/shell.h" | 21 #include "ash/shell.h" |
| 22 #include "ash/shell/toplevel_window.h" | 22 #include "ash/shell/toplevel_window.h" |
| 23 #include "ash/test/ash_test_environment.h" | 23 #include "ash/test/ash_test_environment.h" |
| 24 #include "ash/test/ash_test_helper.h" | 24 #include "ash/test/ash_test_helper.h" |
| 25 #include "ash/test/display_manager_test_api.h" | 25 #include "ash/test/display_manager_test_api.h" |
| 26 #include "ash/test/test_shell_delegate.h" | 26 #include "ash/test/test_shell_delegate.h" |
| 27 #include "base/command_line.h" | 27 #include "base/command_line.h" |
| 28 #include "ui/aura/client/aura_constants.h" | 28 #include "ui/aura/client/aura_constants.h" |
| 29 #include "ui/aura/client/screen_position_client.h" | 29 #include "ui/aura/client/screen_position_client.h" |
| 30 #include "ui/aura/client/window_tree_client.h" | 30 #include "ui/aura/client/window_parenting_client.h" |
| 31 #include "ui/aura/env.h" | 31 #include "ui/aura/env.h" |
| 32 #include "ui/aura/test/event_generator_delegate_aura.h" | 32 #include "ui/aura/test/event_generator_delegate_aura.h" |
| 33 #include "ui/aura/test/test_window_delegate.h" | 33 #include "ui/aura/test/test_window_delegate.h" |
| 34 #include "ui/aura/window.h" | 34 #include "ui/aura/window.h" |
| 35 #include "ui/aura/window_delegate.h" | 35 #include "ui/aura/window_delegate.h" |
| 36 #include "ui/aura/window_tree_host.h" | 36 #include "ui/aura/window_tree_host.h" |
| 37 #include "ui/base/ime/input_method_initializer.h" | 37 #include "ui/base/ime/input_method_initializer.h" |
| 38 #include "ui/display/display.h" | 38 #include "ui/display/display.h" |
| 39 #include "ui/display/display_switches.h" | 39 #include "ui/display/display_switches.h" |
| 40 #include "ui/display/screen.h" | 40 #include "ui/display/screen.h" |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 | 397 |
| 398 void AshTestBase::SwapPrimaryDisplay() { | 398 void AshTestBase::SwapPrimaryDisplay() { |
| 399 if (display::Screen::GetScreen()->GetNumDisplays() <= 1) | 399 if (display::Screen::GetScreen()->GetNumDisplays() <= 1) |
| 400 return; | 400 return; |
| 401 Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId( | 401 Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId( |
| 402 display_manager()->GetSecondaryDisplay().id()); | 402 display_manager()->GetSecondaryDisplay().id()); |
| 403 } | 403 } |
| 404 | 404 |
| 405 } // namespace test | 405 } // namespace test |
| 406 } // namespace ash | 406 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2438853002:
Renames aura::client::WindowTreeClient to WindowParentingClient (Closed)
