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

Side by Side Diff: ash/display/window_tree_host_manager.cc

Issue 1966903002: Fix include path for moved thread_task_runner_handle.h header in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: Created 4 years, 7 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/display/mirror_window_controller.cc ('k') | ash/drag_drop/drag_drop_controller.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/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>
(...skipping 15 matching lines...) Expand all
26 #include "ash/root_window_settings.h" 26 #include "ash/root_window_settings.h"
27 #include "ash/screen_util.h" 27 #include "ash/screen_util.h"
28 #include "ash/shell.h" 28 #include "ash/shell.h"
29 #include "ash/shell_delegate.h" 29 #include "ash/shell_delegate.h"
30 #include "ash/system/tray/system_tray.h" 30 #include "ash/system/tray/system_tray.h"
31 #include "ash/wm/window_util.h" 31 #include "ash/wm/window_util.h"
32 #include "base/command_line.h" 32 #include "base/command_line.h"
33 #include "base/stl_util.h" 33 #include "base/stl_util.h"
34 #include "base/strings/stringprintf.h" 34 #include "base/strings/stringprintf.h"
35 #include "base/strings/utf_string_conversions.h" 35 #include "base/strings/utf_string_conversions.h"
36 #include "base/thread_task_runner_handle.h" 36 #include "base/threading/thread_task_runner_handle.h"
37 #include "ui/aura/client/capture_client.h" 37 #include "ui/aura/client/capture_client.h"
38 #include "ui/aura/client/focus_client.h" 38 #include "ui/aura/client/focus_client.h"
39 #include "ui/aura/client/screen_position_client.h" 39 #include "ui/aura/client/screen_position_client.h"
40 #include "ui/aura/window.h" 40 #include "ui/aura/window.h"
41 #include "ui/aura/window_event_dispatcher.h" 41 #include "ui/aura/window_event_dispatcher.h"
42 #include "ui/aura/window_property.h" 42 #include "ui/aura/window_property.h"
43 #include "ui/aura/window_tracker.h" 43 #include "ui/aura/window_tracker.h"
44 #include "ui/aura/window_tree_host.h" 44 #include "ui/aura/window_tree_host.h"
45 #include "ui/base/ime/input_method_factory.h" 45 #include "ui/base/ime/input_method_factory.h"
46 #include "ui/compositor/compositor.h" 46 #include "ui/compositor/compositor.h"
(...skipping 799 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/mirror_window_controller.cc ('k') | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698