Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Side by Side Diff: ash/test/ash_test_base.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/test/ash_test.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "ash/common/test/test_system_tray_delegate.h"
12 #include "ash/common/wm/window_positioner.h"
13 #include "ash/common/wm_shell.h"
14 #include "ash/common/wm_window.h"
15 #include "ash/display/extended_mouse_warp_controller.h" 10 #include "ash/display/extended_mouse_warp_controller.h"
16 #include "ash/display/mouse_cursor_event_filter.h" 11 #include "ash/display/mouse_cursor_event_filter.h"
17 #include "ash/display/unified_mouse_warp_controller.h" 12 #include "ash/display/unified_mouse_warp_controller.h"
18 #include "ash/display/window_tree_host_manager.h" 13 #include "ash/display/window_tree_host_manager.h"
19 #include "ash/ime/input_method_event_handler.h" 14 #include "ash/ime/input_method_event_handler.h"
20 #include "ash/root_window_controller.h" 15 #include "ash/root_window_controller.h"
21 #include "ash/shell.h" 16 #include "ash/shell.h"
22 #include "ash/shell/toplevel_window.h" 17 #include "ash/shell/toplevel_window.h"
23 #include "ash/test/ash_test_environment.h" 18 #include "ash/test/ash_test_environment.h"
24 #include "ash/test/ash_test_helper.h" 19 #include "ash/test/ash_test_helper.h"
20 #include "ash/test/test_session_state_delegate.h"
25 #include "ash/test/test_shell_delegate.h" 21 #include "ash/test/test_shell_delegate.h"
22 #include "ash/test/test_system_tray_delegate.h"
23 #include "ash/wm/window_positioner.h"
24 #include "ash/wm_shell.h"
25 #include "ash/wm_window.h"
26 #include "base/command_line.h" 26 #include "base/command_line.h"
27 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 27 #include "services/ui/public/interfaces/window_manager_constants.mojom.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_parenting_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"
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId( 393 Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId(
394 display_manager()->GetSecondaryDisplay().id()); 394 display_manager()->GetSecondaryDisplay().id());
395 } 395 }
396 396
397 display::Display AshTestBase::GetSecondaryDisplay() { 397 display::Display AshTestBase::GetSecondaryDisplay() {
398 return ash_test_helper_->GetSecondaryDisplay(); 398 return ash_test_helper_->GetSecondaryDisplay();
399 } 399 }
400 400
401 } // namespace test 401 } // namespace test
402 } // namespace ash 402 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698