| 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.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
| 8 #include "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
| 9 #include "ash/display/display_info.h" | 9 #include "ash/display/display_info.h" |
| 10 #include "ash/material_design/material_design_controller.h" | 10 #include "ash/material_design/material_design_controller.h" |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 } | 168 } |
| 169 if (dbus_thread_manager_initialized_) { | 169 if (dbus_thread_manager_initialized_) { |
| 170 chromeos::DBusThreadManager::Shutdown(); | 170 chromeos::DBusThreadManager::Shutdown(); |
| 171 dbus_thread_manager_initialized_ = false; | 171 dbus_thread_manager_initialized_ = false; |
| 172 } | 172 } |
| 173 #endif | 173 #endif |
| 174 | 174 |
| 175 ui::TerminateContextFactoryForTests(); | 175 ui::TerminateContextFactoryForTests(); |
| 176 | 176 |
| 177 // Need to reset the initial login status. | 177 // Need to reset the initial login status. |
| 178 TestSystemTrayDelegate::SetInitialLoginStatus(user::LOGGED_IN_USER); | 178 TestSystemTrayDelegate::SetInitialLoginStatus(LoginStatus::USER); |
| 179 | 179 |
| 180 ui::ShutdownInputMethodForTesting(); | 180 ui::ShutdownInputMethodForTesting(); |
| 181 zero_duration_mode_.reset(); | 181 zero_duration_mode_.reset(); |
| 182 | 182 |
| 183 CHECK(!::wm::ScopedCaptureClient::IsActive()); | 183 CHECK(!::wm::ScopedCaptureClient::IsActive()); |
| 184 | 184 |
| 185 views_delegate_.reset(); | 185 views_delegate_.reset(); |
| 186 } | 186 } |
| 187 | 187 |
| 188 void AshTestHelper::RunAllPendingInMessageLoop() { | 188 void AshTestHelper::RunAllPendingInMessageLoop() { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 219 bool AshTestHelper::SupportsHostWindowResize() { | 219 bool AshTestHelper::SupportsHostWindowResize() { |
| 220 #if defined(OS_WIN) | 220 #if defined(OS_WIN) |
| 221 return false; | 221 return false; |
| 222 #else | 222 #else |
| 223 return true; | 223 return true; |
| 224 #endif | 224 #endif |
| 225 } | 225 } |
| 226 | 226 |
| 227 } // namespace test | 227 } // namespace test |
| 228 } // namespace ash | 228 } // namespace ash |
| OLD | NEW |