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" |
11 #include "ash/display/display_controller.h" | 11 #include "ash/display/display_controller.h" |
| 12 #include "ash/ime/input_method_event_handler.h" |
12 #include "ash/shell.h" | 13 #include "ash/shell.h" |
13 #include "ash/shell/toplevel_window.h" | 14 #include "ash/shell/toplevel_window.h" |
14 #include "ash/test/ash_test_helper.h" | 15 #include "ash/test/ash_test_helper.h" |
15 #include "ash/test/display_manager_test_api.h" | 16 #include "ash/test/display_manager_test_api.h" |
16 #include "ash/test/test_session_state_delegate.h" | 17 #include "ash/test/test_session_state_delegate.h" |
17 #include "ash/test/test_shell_delegate.h" | 18 #include "ash/test/test_shell_delegate.h" |
18 #include "ash/test/test_system_tray_delegate.h" | 19 #include "ash/test/test_system_tray_delegate.h" |
19 #include "ash/wm/window_positioner.h" | 20 #include "ash/wm/window_positioner.h" |
20 #include "base/command_line.h" | 21 #include "base/command_line.h" |
21 #include "ui/aura/client/aura_constants.h" | 22 #include "ui/aura/client/aura_constants.h" |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 break; | 354 break; |
354 } | 355 } |
355 } | 356 } |
356 | 357 |
357 void AshTestBase::UnblockUserSession() { | 358 void AshTestBase::UnblockUserSession() { |
358 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); | 359 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); |
359 SetSessionStarted(true); | 360 SetSessionStarted(true); |
360 SetUserAddingScreenRunning(false); | 361 SetUserAddingScreenRunning(false); |
361 } | 362 } |
362 | 363 |
| 364 void AshTestBase::DisableIME() { |
| 365 Shell::GetInstance()->RemovePreTargetHandler( |
| 366 Shell::GetInstance()->display_controller()->input_method_event_handler()); |
| 367 } |
363 | 368 |
364 } // namespace test | 369 } // namespace test |
365 } // namespace ash | 370 } // namespace ash |
OLD | NEW |