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

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

Issue 1130753004: virtual keyboard: It is not longer necessary to 'reset' for tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 7 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 | « no previous file | ui/keyboard/keyboard.h » ('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/shell_init_params.h" 10 #include "ash/shell_init_params.h"
(...skipping 11 matching lines...) Expand all
22 #include "ui/aura/test/event_generator_delegate_aura.h" 22 #include "ui/aura/test/event_generator_delegate_aura.h"
23 #include "ui/base/ime/input_method_initializer.h" 23 #include "ui/base/ime/input_method_initializer.h"
24 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 24 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
25 #include "ui/compositor/test/context_factories_for_test.h" 25 #include "ui/compositor/test/context_factories_for_test.h"
26 #include "ui/message_center/message_center.h" 26 #include "ui/message_center/message_center.h"
27 #include "ui/wm/core/capture_controller.h" 27 #include "ui/wm/core/capture_controller.h"
28 28
29 #if defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
30 #include "chromeos/audio/cras_audio_handler.h" 30 #include "chromeos/audio/cras_audio_handler.h"
31 #include "chromeos/dbus/dbus_thread_manager.h" 31 #include "chromeos/dbus/dbus_thread_manager.h"
32 #include "ui/keyboard/keyboard.h"
33 #endif 32 #endif
34 33
35 #if defined(OS_WIN) 34 #if defined(OS_WIN)
36 #include "base/win/windows_version.h" 35 #include "base/win/windows_version.h"
37 #endif 36 #endif
38 37
39 #if defined(USE_X11) 38 #if defined(USE_X11)
40 #include "ui/aura/window_tree_host_x11.h" 39 #include "ui/aura/window_tree_host_x11.h"
41 #endif 40 #endif
42 41
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 118
120 // Remove global message center state. 119 // Remove global message center state.
121 message_center::MessageCenter::Shutdown(); 120 message_center::MessageCenter::Shutdown();
122 121
123 #if defined(OS_CHROMEOS) 122 #if defined(OS_CHROMEOS)
124 chromeos::CrasAudioHandler::Shutdown(); 123 chromeos::CrasAudioHandler::Shutdown();
125 if (dbus_thread_manager_initialized_) { 124 if (dbus_thread_manager_initialized_) {
126 chromeos::DBusThreadManager::Shutdown(); 125 chromeos::DBusThreadManager::Shutdown();
127 dbus_thread_manager_initialized_ = false; 126 dbus_thread_manager_initialized_ = false;
128 } 127 }
129 keyboard::ResetKeyboardForTesting();
130 #endif 128 #endif
131 129
132 aura::Env::DeleteInstance(); 130 aura::Env::DeleteInstance();
133 ui::TerminateContextFactoryForTests(); 131 ui::TerminateContextFactoryForTests();
134 132
135 // Need to reset the initial login status. 133 // Need to reset the initial login status.
136 TestSystemTrayDelegate::SetInitialLoginStatus(user::LOGGED_IN_USER); 134 TestSystemTrayDelegate::SetInitialLoginStatus(user::LOGGED_IN_USER);
137 135
138 ui::ShutdownInputMethodForTesting(); 136 ui::ShutdownInputMethodForTesting();
139 zero_duration_mode_.reset(); 137 zero_duration_mode_.reset();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 bool AshTestHelper::SupportsHostWindowResize() { 176 bool AshTestHelper::SupportsHostWindowResize() {
179 #if defined(OS_WIN) 177 #if defined(OS_WIN)
180 return false; 178 return false;
181 #else 179 #else
182 return true; 180 return true;
183 #endif 181 #endif
184 } 182 }
185 183
186 } // namespace test 184 } // namespace test
187 } // namespace ash 185 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ui/keyboard/keyboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698