| 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_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 Loading... |
| 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 Loading... |
| 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 |
| OLD | NEW |