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

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

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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_helper.h ('k') | ash/test/ash_test_helper_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.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/common/ash_switches.h" 8 #include "ash/common/ash_switches.h"
9 #include "ash/common/display/display_info.h" 9 #include "ash/common/display/display_info.h"
10 #include "ash/common/material_design/material_design_controller.h" 10 #include "ash/common/material_design/material_design_controller.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #if defined(OS_CHROMEOS) 61 #if defined(OS_CHROMEOS)
62 dbus_thread_manager_initialized_ = false; 62 dbus_thread_manager_initialized_ = false;
63 bluez_dbus_manager_initialized_ = false; 63 bluez_dbus_manager_initialized_ = false;
64 #endif 64 #endif
65 #if defined(USE_X11) 65 #if defined(USE_X11)
66 aura::test::SetUseOverrideRedirectWindowByDefault(true); 66 aura::test::SetUseOverrideRedirectWindowByDefault(true);
67 #endif 67 #endif
68 aura::test::InitializeAuraEventGeneratorDelegate(); 68 aura::test::InitializeAuraEventGeneratorDelegate();
69 } 69 }
70 70
71 AshTestHelper::~AshTestHelper() { 71 AshTestHelper::~AshTestHelper() {}
72 }
73 72
74 void AshTestHelper::SetUp(bool start_session) { 73 void AshTestHelper::SetUp(bool start_session) {
75 ResetDisplayIdForTest(); 74 ResetDisplayIdForTest();
76 views_delegate_.reset(new AshTestViewsDelegate); 75 views_delegate_.reset(new AshTestViewsDelegate);
77 76
78 // Disable animations during tests. 77 // Disable animations during tests.
79 zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode( 78 zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
80 ui::ScopedAnimationDurationScaleMode::ZERO_DURATION)); 79 ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
81 ui::InitializeInputMethodForTesting(); 80 ui::InitializeInputMethodForTesting();
82 81
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 bool AshTestHelper::SupportsHostWindowResize() { 219 bool AshTestHelper::SupportsHostWindowResize() {
221 #if defined(OS_WIN) 220 #if defined(OS_WIN)
222 return false; 221 return false;
223 #else 222 #else
224 return true; 223 return true;
225 #endif 224 #endif
226 } 225 }
227 226
228 } // namespace test 227 } // namespace test
229 } // namespace ash 228 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_helper.h ('k') | ash/test/ash_test_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698