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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/root_window_controller.cc

Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_root_window_controller_common
Patch Set: merge 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/metrics/user_metrics_recorder.cc ('k') | ash/root_window_controller_common.h » ('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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_constants.h" 10 #include "ash/ash_constants.h"
11 #include "ash/ash_switches.h" 11 #include "ash/ash_switches.h"
12 #include "ash/common/root_window_controller_common.h"
13 #include "ash/common/shell_window_ids.h"
12 #include "ash/common/wm/always_on_top_controller.h" 14 #include "ash/common/wm/always_on_top_controller.h"
13 #include "ash/common/wm/container_finder.h" 15 #include "ash/common/wm/container_finder.h"
14 #include "ash/common/wm/dock/docked_window_layout_manager.h" 16 #include "ash/common/wm/dock/docked_window_layout_manager.h"
15 #include "ash/common/wm/fullscreen_window_finder.h" 17 #include "ash/common/wm/fullscreen_window_finder.h"
16 #include "ash/common/wm/panels/panel_layout_manager.h" 18 #include "ash/common/wm/panels/panel_layout_manager.h"
19 #include "ash/common/wm/root_window_layout_manager.h"
17 #include "ash/common/wm/switchable_windows.h" 20 #include "ash/common/wm/switchable_windows.h"
18 #include "ash/common/wm/window_state.h" 21 #include "ash/common/wm/window_state.h"
19 #include "ash/common/wm/wm_globals.h" 22 #include "ash/common/wm/wm_globals.h"
20 #include "ash/common/wm/wm_window.h" 23 #include "ash/common/wm/wm_window.h"
21 #include "ash/common/wm/workspace/workspace_layout_manager.h" 24 #include "ash/common/wm/workspace/workspace_layout_manager.h"
22 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h" 25 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
23 #include "ash/desktop_background/desktop_background_controller.h" 26 #include "ash/desktop_background/desktop_background_controller.h"
24 #include "ash/desktop_background/desktop_background_widget_controller.h" 27 #include "ash/desktop_background/desktop_background_widget_controller.h"
25 #include "ash/desktop_background/user_wallpaper_delegate.h" 28 #include "ash/desktop_background/user_wallpaper_delegate.h"
26 #include "ash/display/display_manager.h" 29 #include "ash/display/display_manager.h"
27 #include "ash/focus_cycler.h" 30 #include "ash/focus_cycler.h"
28 #include "ash/high_contrast/high_contrast_controller.h" 31 #include "ash/high_contrast/high_contrast_controller.h"
29 #include "ash/host/ash_window_tree_host.h" 32 #include "ash/host/ash_window_tree_host.h"
30 #include "ash/root_window_controller_common.h"
31 #include "ash/root_window_settings.h" 33 #include "ash/root_window_settings.h"
32 #include "ash/session/session_state_delegate.h" 34 #include "ash/session/session_state_delegate.h"
33 #include "ash/shelf/shelf_layout_manager.h" 35 #include "ash/shelf/shelf_layout_manager.h"
34 #include "ash/shelf/shelf_types.h" 36 #include "ash/shelf/shelf_types.h"
35 #include "ash/shelf/shelf_widget.h" 37 #include "ash/shelf/shelf_widget.h"
36 #include "ash/shell.h" 38 #include "ash/shell.h"
37 #include "ash/shell_delegate.h" 39 #include "ash/shell_delegate.h"
38 #include "ash/shell_factory.h" 40 #include "ash/shell_factory.h"
39 #include "ash/shell_window_ids.h"
40 #include "ash/system/status_area_widget.h" 41 #include "ash/system/status_area_widget.h"
41 #include "ash/system/tray/system_tray_delegate.h" 42 #include "ash/system/tray/system_tray_delegate.h"
42 #include "ash/system/tray/system_tray_notifier.h" 43 #include "ash/system/tray/system_tray_notifier.h"
43 #include "ash/touch/touch_hud_debug.h" 44 #include "ash/touch/touch_hud_debug.h"
44 #include "ash/touch/touch_hud_projection.h" 45 #include "ash/touch/touch_hud_projection.h"
45 #include "ash/touch/touch_observer_hud.h" 46 #include "ash/touch/touch_observer_hud.h"
46 #include "ash/wm/aura/aura_layout_manager_adapter.h" 47 #include "ash/wm/aura/aura_layout_manager_adapter.h"
47 #include "ash/wm/aura/wm_shelf_aura.h" 48 #include "ash/wm/aura/wm_shelf_aura.h"
48 #include "ash/wm/aura/wm_window_aura.h" 49 #include "ash/wm/aura/wm_window_aura.h"
49 #include "ash/wm/lock_layout_manager.h" 50 #include "ash/wm/lock_layout_manager.h"
50 #include "ash/wm/panels/attached_panel_window_targeter.h" 51 #include "ash/wm/panels/attached_panel_window_targeter.h"
51 #include "ash/wm/panels/panel_window_event_handler.h" 52 #include "ash/wm/panels/panel_window_event_handler.h"
52 #include "ash/wm/root_window_layout_manager.h"
53 #include "ash/wm/stacking_controller.h" 53 #include "ash/wm/stacking_controller.h"
54 #include "ash/wm/status_area_layout_manager.h" 54 #include "ash/wm/status_area_layout_manager.h"
55 #include "ash/wm/system_background_controller.h" 55 #include "ash/wm/system_background_controller.h"
56 #include "ash/wm/system_modal_container_layout_manager.h" 56 #include "ash/wm/system_modal_container_layout_manager.h"
57 #include "ash/wm/window_properties.h" 57 #include "ash/wm/window_properties.h"
58 #include "ash/wm/window_state_aura.h" 58 #include "ash/wm/window_state_aura.h"
59 #include "ash/wm/window_util.h" 59 #include "ash/wm/window_util.h"
60 #include "ash/wm/workspace_controller.h" 60 #include "ash/wm/workspace_controller.h"
61 #include "base/command_line.h" 61 #include "base/command_line.h"
62 #include "base/macros.h" 62 #include "base/macros.h"
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 aura::Window* primary_root_window = Shell::GetInstance() 875 aura::Window* primary_root_window = Shell::GetInstance()
876 ->window_tree_host_manager() 876 ->window_tree_host_manager()
877 ->GetPrimaryRootWindow(); 877 ->GetPrimaryRootWindow();
878 return GetRootWindowSettings(primary_root_window)->controller; 878 return GetRootWindowSettings(primary_root_window)->controller;
879 } 879 }
880 880
881 return GetRootWindowSettings(root_window)->controller; 881 return GetRootWindowSettings(root_window)->controller;
882 } 882 }
883 883
884 } // namespace ash 884 } // namespace ash
OLDNEW
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/root_window_controller_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698