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

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
Patch Set: rebase Created 4 years, 5 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/common/ash_switches.h" 13 #include "ash/common/ash_switches.h"
14 #include "ash/common/system/tray/system_tray.h"
14 #include "ash/display/cursor_window_controller.h" 15 #include "ash/display/cursor_window_controller.h"
15 #include "ash/display/display_layout_store.h" 16 #include "ash/display/display_layout_store.h"
16 #include "ash/display/display_manager.h" 17 #include "ash/display/display_manager.h"
17 #include "ash/display/mirror_window_controller.h" 18 #include "ash/display/mirror_window_controller.h"
18 #include "ash/display/root_window_transformers.h" 19 #include "ash/display/root_window_transformers.h"
19 #include "ash/host/ash_window_tree_host.h" 20 #include "ash/host/ash_window_tree_host.h"
20 #include "ash/host/ash_window_tree_host_init_params.h" 21 #include "ash/host/ash_window_tree_host_init_params.h"
21 #include "ash/host/root_window_transformer.h" 22 #include "ash/host/root_window_transformer.h"
22 #include "ash/ime/input_method_event_handler.h" 23 #include "ash/ime/input_method_event_handler.h"
23 #include "ash/magnifier/magnification_controller.h" 24 #include "ash/magnifier/magnification_controller.h"
24 #include "ash/magnifier/partial_magnification_controller.h" 25 #include "ash/magnifier/partial_magnification_controller.h"
25 #include "ash/root_window_controller.h" 26 #include "ash/root_window_controller.h"
26 #include "ash/root_window_settings.h" 27 #include "ash/root_window_settings.h"
27 #include "ash/screen_util.h" 28 #include "ash/screen_util.h"
28 #include "ash/shell.h" 29 #include "ash/shell.h"
29 #include "ash/system/tray/system_tray.h"
30 #include "ash/wm/window_util.h" 30 #include "ash/wm/window_util.h"
31 #include "base/command_line.h" 31 #include "base/command_line.h"
32 #include "base/stl_util.h" 32 #include "base/stl_util.h"
33 #include "base/strings/stringprintf.h" 33 #include "base/strings/stringprintf.h"
34 #include "base/strings/utf_string_conversions.h" 34 #include "base/strings/utf_string_conversions.h"
35 #include "base/threading/thread_task_runner_handle.h" 35 #include "base/threading/thread_task_runner_handle.h"
36 #include "ui/aura/client/capture_client.h" 36 #include "ui/aura/client/capture_client.h"
37 #include "ui/aura/client/focus_client.h" 37 #include "ui/aura/client/focus_client.h"
38 #include "ui/aura/client/screen_position_client.h" 38 #include "ui/aura/client/screen_position_client.h"
39 #include "ui/aura/window.h" 39 #include "ui/aura/window.h"
(...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 SetDisplayPropertiesOnHost(ash_host, display); 845 SetDisplayPropertiesOnHost(ash_host, display);
846 846
847 #if defined(OS_CHROMEOS) 847 #if defined(OS_CHROMEOS)
848 if (switches::ConstrainPointerToRoot()) 848 if (switches::ConstrainPointerToRoot())
849 ash_host->ConfineCursorToRootWindow(); 849 ash_host->ConfineCursorToRootWindow();
850 #endif 850 #endif
851 return ash_host; 851 return ash_host;
852 } 852 }
853 853
854 } // namespace ash 854 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/web_notification/web_notification_tray.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698