| 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/display/extended_mouse_warp_controller.h" | 10 #include "ash/display/extended_mouse_warp_controller.h" |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 } | 355 } |
| 356 | 356 |
| 357 void AshTestBase::UnblockUserSession() { | 357 void AshTestBase::UnblockUserSession() { |
| 358 SetSessionStarted(true); | 358 SetSessionStarted(true); |
| 359 GetSessionControllerClient()->UnlockScreen(); | 359 GetSessionControllerClient()->UnlockScreen(); |
| 360 } | 360 } |
| 361 | 361 |
| 362 void AshTestBase::DisableIME() { | 362 void AshTestBase::DisableIME() { |
| 363 // WindowTreeHostManager isn't applicable to mash and IME is routed | 363 // WindowTreeHostManager isn't applicable to mash and IME is routed |
| 364 // differently in mash. | 364 // differently in mash. |
| 365 if (ShellPort::Get()->IsRunningInMash()) | 365 if (Shell::GetAshConfig() == Config::MASH) |
| 366 return; | 366 return; |
| 367 | 367 |
| 368 Shell::Get()->RemovePreTargetHandler( | 368 Shell::Get()->RemovePreTargetHandler( |
| 369 Shell::Get()->window_tree_host_manager()->input_method_event_handler()); | 369 Shell::Get()->window_tree_host_manager()->input_method_event_handler()); |
| 370 } | 370 } |
| 371 | 371 |
| 372 display::DisplayManager* AshTestBase::display_manager() { | 372 display::DisplayManager* AshTestBase::display_manager() { |
| 373 return Shell::Get()->display_manager(); | 373 return Shell::Get()->display_manager(); |
| 374 } | 374 } |
| 375 | 375 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 396 Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId( | 396 Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId( |
| 397 display_manager()->GetSecondaryDisplay().id()); | 397 display_manager()->GetSecondaryDisplay().id()); |
| 398 } | 398 } |
| 399 | 399 |
| 400 display::Display AshTestBase::GetSecondaryDisplay() { | 400 display::Display AshTestBase::GetSecondaryDisplay() { |
| 401 return ash_test_helper_->GetSecondaryDisplay(); | 401 return ash_test_helper_->GetSecondaryDisplay(); |
| 402 } | 402 } |
| 403 | 403 |
| 404 } // namespace test | 404 } // namespace test |
| 405 } // namespace ash | 405 } // namespace ash |
| OLD | NEW |