| OLD | NEW |
| 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_session_state_delegate.h" | 10 #include "ash/common/test/test_session_state_delegate.h" |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 bluez_dbus_manager_initialized_ = false; | 173 bluez_dbus_manager_initialized_ = false; |
| 174 } | 174 } |
| 175 if (dbus_thread_manager_initialized_) { | 175 if (dbus_thread_manager_initialized_) { |
| 176 chromeos::DBusThreadManager::Shutdown(); | 176 chromeos::DBusThreadManager::Shutdown(); |
| 177 dbus_thread_manager_initialized_ = false; | 177 dbus_thread_manager_initialized_ = false; |
| 178 } | 178 } |
| 179 #endif | 179 #endif |
| 180 | 180 |
| 181 ui::TerminateContextFactoryForTests(); | 181 ui::TerminateContextFactoryForTests(); |
| 182 | 182 |
| 183 // Need to reset the initial login status. | |
| 184 TestSystemTrayDelegate::SetInitialLoginStatus(LoginStatus::USER); | |
| 185 TestSystemTrayDelegate::SetSystemUpdateRequired(false); | 183 TestSystemTrayDelegate::SetSystemUpdateRequired(false); |
| 186 | 184 |
| 187 ui::ShutdownInputMethodForTesting(); | 185 ui::ShutdownInputMethodForTesting(); |
| 188 zero_duration_mode_.reset(); | 186 zero_duration_mode_.reset(); |
| 189 | 187 |
| 190 CHECK(!::wm::ScopedCaptureClient::IsActive()); | 188 CHECK(!::wm::ScopedCaptureClient::IsActive()); |
| 191 | 189 |
| 192 views_delegate_.reset(); | 190 views_delegate_.reset(); |
| 193 } | 191 } |
| 194 | 192 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 216 bool AshTestHelper::SupportsMultipleDisplays() { | 214 bool AshTestHelper::SupportsMultipleDisplays() { |
| 217 #if defined(OS_WIN) | 215 #if defined(OS_WIN) |
| 218 return false; | 216 return false; |
| 219 #else | 217 #else |
| 220 return true; | 218 return true; |
| 221 #endif | 219 #endif |
| 222 } | 220 } |
| 223 | 221 |
| 224 } // namespace test | 222 } // namespace test |
| 225 } // namespace ash | 223 } // namespace ash |
| OLD | NEW |