| 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 22 matching lines...) Expand all Loading... |
| 33 #include "ui/gfx/geometry/point.h" | 33 #include "ui/gfx/geometry/point.h" |
| 34 #include "ui/gfx/screen.h" | 34 #include "ui/gfx/screen.h" |
| 35 #include "ui/wm/core/coordinate_conversion.h" | 35 #include "ui/wm/core/coordinate_conversion.h" |
| 36 | 36 |
| 37 #if defined(OS_CHROMEOS) | 37 #if defined(OS_CHROMEOS) |
| 38 #include "ash/system/chromeos/tray_display.h" | 38 #include "ash/system/chromeos/tray_display.h" |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 #if defined(OS_WIN) | 41 #if defined(OS_WIN) |
| 42 #include "base/win/windows_version.h" | 42 #include "base/win/windows_version.h" |
| 43 #include "ui/aura/remote_window_tree_host_win.h" |
| 43 #include "ui/platform_window/win/win_window.h" | 44 #include "ui/platform_window/win/win_window.h" |
| 44 #include "win8/test/test_registrar_constants.h" | 45 #include "win8/test/test_registrar_constants.h" |
| 45 #endif | 46 #endif |
| 46 | 47 |
| 47 #if defined(USE_X11) | 48 #if defined(USE_X11) |
| 48 #include "ui/gfx/x/x11_connection.h" | 49 #include "ui/gfx/x/x11_connection.h" |
| 49 #endif | 50 #endif |
| 50 | 51 |
| 51 namespace ash { | 52 namespace ash { |
| 52 namespace test { | 53 namespace test { |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 | 338 |
| 338 void AshTestBase::DisableIME() { | 339 void AshTestBase::DisableIME() { |
| 339 Shell::GetInstance()->RemovePreTargetHandler( | 340 Shell::GetInstance()->RemovePreTargetHandler( |
| 340 Shell::GetInstance() | 341 Shell::GetInstance() |
| 341 ->window_tree_host_manager() | 342 ->window_tree_host_manager() |
| 342 ->input_method_event_handler()); | 343 ->input_method_event_handler()); |
| 343 } | 344 } |
| 344 | 345 |
| 345 } // namespace test | 346 } // namespace test |
| 346 } // namespace ash | 347 } // namespace ash |
| OLD | NEW |