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

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

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | ash/test/cursor_manager_test_api.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_helper.h" 5 #include "ash/test/ash_test_helper.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/display_manager_test_api.h" 10 #include "ash/test/display_manager_test_api.h"
11 #include "ash/test/shell_test_api.h" 11 #include "ash/test/shell_test_api.h"
12 #include "ash/test/test_screenshot_delegate.h" 12 #include "ash/test/test_screenshot_delegate.h"
13 #include "ash/test/test_session_state_delegate.h" 13 #include "ash/test/test_session_state_delegate.h"
14 #include "ash/test/test_shell_delegate.h" 14 #include "ash/test/test_shell_delegate.h"
15 #include "ash/test/test_system_tray_delegate.h" 15 #include "ash/test/test_system_tray_delegate.h"
16 #include "base/run_loop.h" 16 #include "base/run_loop.h"
17 #include "ui/aura/env.h" 17 #include "ui/aura/env.h"
18 #include "ui/aura/input_state_lookup.h" 18 #include "ui/aura/input_state_lookup.h"
19 #include "ui/aura/test/env_test_helper.h" 19 #include "ui/aura/test/env_test_helper.h"
20 #include "ui/base/ime/input_method_initializer.h" 20 #include "ui/base/ime/input_method_initializer.h"
21 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 21 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
22 #include "ui/compositor/test/context_factories_for_test.h" 22 #include "ui/compositor/test/context_factories_for_test.h"
23 #include "ui/message_center/message_center.h" 23 #include "ui/message_center/message_center.h"
24 #include "ui/views/corewm/capture_controller.h" 24 #include "ui/wm/core/capture_controller.h"
25 #include "ui/views/corewm/wm_state.h" 25 #include "ui/wm/core/wm_state.h"
26 26
27 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
28 #include "chromeos/audio/cras_audio_handler.h" 28 #include "chromeos/audio/cras_audio_handler.h"
29 #include "chromeos/dbus/dbus_thread_manager.h" 29 #include "chromeos/dbus/dbus_thread_manager.h"
30 #include "ui/keyboard/keyboard.h" 30 #include "ui/keyboard/keyboard.h"
31 #endif 31 #endif
32 32
33 #if defined(USE_X11) 33 #if defined(USE_X11)
34 #include "ui/aura/window_tree_host_x11.h" 34 #include "ui/aura/window_tree_host_x11.h"
35 #endif 35 #endif
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 aura::Window* AshTestHelper::CurrentContext() { 141 aura::Window* AshTestHelper::CurrentContext() {
142 aura::Window* root_window = Shell::GetTargetRootWindow(); 142 aura::Window* root_window = Shell::GetTargetRootWindow();
143 if (!root_window) 143 if (!root_window)
144 root_window = Shell::GetPrimaryRootWindow(); 144 root_window = Shell::GetPrimaryRootWindow();
145 DCHECK(root_window); 145 DCHECK(root_window);
146 return root_window; 146 return root_window;
147 } 147 }
148 148
149 } // namespace test 149 } // namespace test
150 } // namespace ash 150 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | ash/test/cursor_manager_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698