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

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

Issue 1115033003: resources: Prevent including the same resource in multiple pack files. (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 | ash/test/test_suite.cc » ('j') | ui/base/resource/data_pack.cc » ('J')
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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 // Remove global message center state. 120 // Remove global message center state.
121 message_center::MessageCenter::Shutdown(); 121 message_center::MessageCenter::Shutdown();
122 122
123 #if defined(OS_CHROMEOS) 123 #if defined(OS_CHROMEOS)
124 chromeos::CrasAudioHandler::Shutdown(); 124 chromeos::CrasAudioHandler::Shutdown();
125 if (dbus_thread_manager_initialized_) { 125 if (dbus_thread_manager_initialized_) {
126 chromeos::DBusThreadManager::Shutdown(); 126 chromeos::DBusThreadManager::Shutdown();
127 dbus_thread_manager_initialized_ = false; 127 dbus_thread_manager_initialized_ = false;
128 } 128 }
129 keyboard::ResetKeyboardForTesting();
Nico 2015/05/02 00:50:48 ?
sadrul 2015/05/02 04:17:09 A new instance of ash::Shell gets created for each
Nico 2015/05/06 01:06:35 I would've guessed that the intention of this is t
130 #endif 129 #endif
131 130
132 aura::Env::DeleteInstance(); 131 aura::Env::DeleteInstance();
133 ui::TerminateContextFactoryForTests(); 132 ui::TerminateContextFactoryForTests();
134 133
135 // Need to reset the initial login status. 134 // Need to reset the initial login status.
136 TestSystemTrayDelegate::SetInitialLoginStatus(user::LOGGED_IN_USER); 135 TestSystemTrayDelegate::SetInitialLoginStatus(user::LOGGED_IN_USER);
137 136
138 ui::ShutdownInputMethodForTesting(); 137 ui::ShutdownInputMethodForTesting();
139 zero_duration_mode_.reset(); 138 zero_duration_mode_.reset();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 bool AshTestHelper::SupportsHostWindowResize() { 177 bool AshTestHelper::SupportsHostWindowResize() {
179 #if defined(OS_WIN) 178 #if defined(OS_WIN)
180 return false; 179 return false;
181 #else 180 #else
182 return true; 181 return true;
183 #endif 182 #endif
184 } 183 }
185 184
186 } // namespace test 185 } // namespace test
187 } // namespace ash 186 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/test/test_suite.cc » ('j') | ui/base/resource/data_pack.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698