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

Side by Side Diff: ash/display/window_tree_host_manager.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
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/display/window_tree_host_manager.h" 5 #include "ash/display/window_tree_host_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
11 #include <utility> 11 #include <utility>
12 12
13 #include "ash/ash_switches.h" 13 #include "ash/common/ash_switches.h"
14 #include "ash/display/cursor_window_controller.h" 14 #include "ash/display/cursor_window_controller.h"
15 #include "ash/display/display_layout_store.h" 15 #include "ash/display/display_layout_store.h"
16 #include "ash/display/display_manager.h" 16 #include "ash/display/display_manager.h"
17 #include "ash/display/mirror_window_controller.h" 17 #include "ash/display/mirror_window_controller.h"
18 #include "ash/display/root_window_transformers.h" 18 #include "ash/display/root_window_transformers.h"
19 #include "ash/host/ash_window_tree_host.h" 19 #include "ash/host/ash_window_tree_host.h"
20 #include "ash/host/ash_window_tree_host_init_params.h" 20 #include "ash/host/ash_window_tree_host_init_params.h"
21 #include "ash/host/root_window_transformer.h" 21 #include "ash/host/root_window_transformer.h"
22 #include "ash/ime/input_method_event_handler.h" 22 #include "ash/ime/input_method_event_handler.h"
23 #include "ash/magnifier/magnification_controller.h" 23 #include "ash/magnifier/magnification_controller.h"
(...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 SetDisplayPropertiesOnHost(ash_host, display); 846 SetDisplayPropertiesOnHost(ash_host, display);
847 847
848 #if defined(OS_CHROMEOS) 848 #if defined(OS_CHROMEOS)
849 if (switches::ConstrainPointerToRoot()) 849 if (switches::ConstrainPointerToRoot())
850 ash_host->ConfineCursorToRootWindow(); 850 ash_host->ConfineCursorToRootWindow();
851 #endif 851 #endif
852 return ash_host; 852 return ash_host;
853 } 853 }
854 854
855 } // namespace ash 855 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/screen_orientation_controller_chromeos.cc ('k') | ash/display/window_tree_host_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698