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

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

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 years, 6 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
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/ash_switches.h"
11 #include "ash/common/wm/window_positioner.h" 11 #include "ash/common/wm/window_positioner.h"
12 #include "ash/common/wm_root_window_controller.h" 12 #include "ash/common/wm_root_window_controller.h"
13 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
14 #include "ash/common/wm_window.h" 14 #include "ash/common/wm_window.h"
15 #include "ash/display/window_tree_host_manager.h" 15 #include "ash/display/window_tree_host_manager.h"
16 #include "ash/ime/input_method_event_handler.h" 16 #include "ash/ime/input_method_event_handler.h"
17 #include "ash/shell.h" 17 #include "ash/shell.h"
18 #include "ash/shell/toplevel_window.h" 18 #include "ash/shell/toplevel_window.h"
19 #include "ash/test/ash_test_helper.h" 19 #include "ash/test/ash_test_helper.h"
20 #include "ash/test/display_manager_test_api.h" 20 #include "ash/test/display_manager_test_api.h"
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 355
356 void AshTestBase::DisableIME() { 356 void AshTestBase::DisableIME() {
357 Shell::GetInstance()->RemovePreTargetHandler( 357 Shell::GetInstance()->RemovePreTargetHandler(
358 Shell::GetInstance() 358 Shell::GetInstance()
359 ->window_tree_host_manager() 359 ->window_tree_host_manager()
360 ->input_method_event_handler()); 360 ->input_method_event_handler());
361 } 361 }
362 362
363 } // namespace test 363 } // namespace test
364 } // namespace ash 364 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698