| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_base.h" | 5 #include "ash/test/ash_test_base.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 } | 265 } |
| 266 | 266 |
| 267 void AshTestBase::RunAllPendingInMessageLoop() { | 267 void AshTestBase::RunAllPendingInMessageLoop() { |
| 268 ash_test_helper_->RunAllPendingInMessageLoop(); | 268 ash_test_helper_->RunAllPendingInMessageLoop(); |
| 269 } | 269 } |
| 270 | 270 |
| 271 TestScreenshotDelegate* AshTestBase::GetScreenshotDelegate() { | 271 TestScreenshotDelegate* AshTestBase::GetScreenshotDelegate() { |
| 272 return ash_test_helper_->test_screenshot_delegate(); | 272 return ash_test_helper_->test_screenshot_delegate(); |
| 273 } | 273 } |
| 274 | 274 |
| 275 SystemTray* AshTestBase::GetPrimarySystemTray() { |
| 276 return Shell::GetInstance()->GetPrimarySystemTray(); |
| 277 } |
| 278 |
| 275 TestSystemTrayDelegate* AshTestBase::GetSystemTrayDelegate() { | 279 TestSystemTrayDelegate* AshTestBase::GetSystemTrayDelegate() { |
| 276 return static_cast<TestSystemTrayDelegate*>( | 280 return static_cast<TestSystemTrayDelegate*>( |
| 277 WmShell::Get()->system_tray_delegate()); | 281 WmShell::Get()->system_tray_delegate()); |
| 278 } | 282 } |
| 279 | 283 |
| 280 void AshTestBase::SetSessionStarted(bool session_started) { | 284 void AshTestBase::SetSessionStarted(bool session_started) { |
| 281 AshTestHelper::GetTestSessionStateDelegate()->SetActiveUserSessionStarted( | 285 AshTestHelper::GetTestSessionStateDelegate()->SetActiveUserSessionStarted( |
| 282 session_started); | 286 session_started); |
| 283 } | 287 } |
| 284 | 288 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 | 341 |
| 338 void AshTestBase::DisableIME() { | 342 void AshTestBase::DisableIME() { |
| 339 Shell::GetInstance()->RemovePreTargetHandler( | 343 Shell::GetInstance()->RemovePreTargetHandler( |
| 340 Shell::GetInstance() | 344 Shell::GetInstance() |
| 341 ->window_tree_host_manager() | 345 ->window_tree_host_manager() |
| 342 ->input_method_event_handler()); | 346 ->input_method_event_handler()); |
| 343 } | 347 } |
| 344 | 348 |
| 345 } // namespace test | 349 } // namespace test |
| 346 } // namespace ash | 350 } // namespace ash |
| OLD | NEW |