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

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

Issue 2384103003: Fix spacing issues on Ash shelf (Closed)
Patch Set: Re-enabled disabled test Created 4 years 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/shelf/shelf_view_unittest.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.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_delegate_aura.h" 7 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
8 #include "ash/common/material_design/material_design_controller.h" 8 #include "ash/common/material_design/material_design_controller.h"
9 #include "ash/common/test/material_design_controller_test_api.h" 9 #include "ash/common/test/material_design_controller_test_api.h"
10 #include "ash/common/test/test_new_window_client.h" 10 #include "ash/common/test/test_new_window_client.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 bluez_dbus_manager_initialized_ = false; 180 bluez_dbus_manager_initialized_ = false;
181 } 181 }
182 if (dbus_thread_manager_initialized_) { 182 if (dbus_thread_manager_initialized_) {
183 chromeos::DBusThreadManager::Shutdown(); 183 chromeos::DBusThreadManager::Shutdown();
184 dbus_thread_manager_initialized_ = false; 184 dbus_thread_manager_initialized_ = false;
185 } 185 }
186 #endif 186 #endif
187 187
188 ui::TerminateContextFactoryForTests(); 188 ui::TerminateContextFactoryForTests();
189 189
190 TestSystemTrayDelegate::SetSystemUpdateRequired(false);
191
192 ui::ShutdownInputMethodForTesting(); 190 ui::ShutdownInputMethodForTesting();
193 zero_duration_mode_.reset(); 191 zero_duration_mode_.reset();
194 192
195 views_delegate_.reset(); 193 views_delegate_.reset();
196 wm_state_.reset(); 194 wm_state_.reset();
197 195
198 CHECK(!::wm::CaptureController::Get()); 196 CHECK(!::wm::CaptureController::Get());
199 } 197 }
200 198
201 void AshTestHelper::RunAllPendingInMessageLoop() { 199 void AshTestHelper::RunAllPendingInMessageLoop() {
(...skipping 20 matching lines...) Expand all
222 bool AshTestHelper::SupportsMultipleDisplays() { 220 bool AshTestHelper::SupportsMultipleDisplays() {
223 #if defined(OS_WIN) 221 #if defined(OS_WIN)
224 return false; 222 return false;
225 #else 223 #else
226 return true; 224 return true;
227 #endif 225 #endif
228 } 226 }
229 227
230 } // namespace test 228 } // namespace test
231 } // namespace ash 229 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698