Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: ash/test/ash_test_base.cc

Issue 1390883003: aura: Unify WindowTreeHost for some platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 23 matching lines...) Expand all
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/aura/remote_window_tree_host_win.h"
44 #include "ui/aura/window_tree_host_win.h"
45 #include "ui/platform_window/win/win_window.h" 44 #include "ui/platform_window/win/win_window.h"
46 #include "win8/test/test_registrar_constants.h" 45 #include "win8/test/test_registrar_constants.h"
47 #endif 46 #endif
48 47
49 #if defined(USE_X11) 48 #if defined(USE_X11)
50 #include "ui/gfx/x/x11_connection.h" 49 #include "ui/gfx/x/x11_connection.h"
51 #endif 50 #endif
52 51
53 namespace ash { 52 namespace ash {
54 namespace test { 53 namespace test {
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 332
334 void AshTestBase::DisableIME() { 333 void AshTestBase::DisableIME() {
335 Shell::GetInstance()->RemovePreTargetHandler( 334 Shell::GetInstance()->RemovePreTargetHandler(
336 Shell::GetInstance() 335 Shell::GetInstance()
337 ->window_tree_host_manager() 336 ->window_tree_host_manager()
338 ->input_method_event_handler()); 337 ->input_method_event_handler());
339 } 338 }
340 339
341 } // namespace test 340 } // namespace test
342 } // namespace ash 341 } // namespace ash
OLDNEW
« no previous file with comments | « ash/host/ash_window_tree_host_win.cc ('k') | ui/aura/BUILD.gn » ('j') | ui/aura/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698