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

Side by Side Diff: ash/root_window_controller.cc

Issue 2187513003: mash: Partially migrate ShelfLayoutManager to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 4 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/screen_ash.cc ('k') | ash/screen_util.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/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/aura/aura_layout_manager_adapter.h" 10 #include "ash/aura/aura_layout_manager_adapter.h"
(...skipping 22 matching lines...) Expand all
33 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h" 33 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
34 #include "ash/common/wm_shell.h" 34 #include "ash/common/wm_shell.h"
35 #include "ash/common/wm_window.h" 35 #include "ash/common/wm_window.h"
36 #include "ash/desktop_background/desktop_background_controller.h" 36 #include "ash/desktop_background/desktop_background_controller.h"
37 #include "ash/desktop_background/desktop_background_widget_controller.h" 37 #include "ash/desktop_background/desktop_background_widget_controller.h"
38 #include "ash/desktop_background/user_wallpaper_delegate.h" 38 #include "ash/desktop_background/user_wallpaper_delegate.h"
39 #include "ash/display/display_manager.h" 39 #include "ash/display/display_manager.h"
40 #include "ash/high_contrast/high_contrast_controller.h" 40 #include "ash/high_contrast/high_contrast_controller.h"
41 #include "ash/host/ash_window_tree_host.h" 41 #include "ash/host/ash_window_tree_host.h"
42 #include "ash/root_window_settings.h" 42 #include "ash/root_window_settings.h"
43 #include "ash/shelf/shelf.h"
43 #include "ash/shelf/shelf_layout_manager.h" 44 #include "ash/shelf/shelf_layout_manager.h"
44 #include "ash/shelf/shelf_widget.h" 45 #include "ash/shelf/shelf_widget.h"
45 #include "ash/shell.h" 46 #include "ash/shell.h"
46 #include "ash/shell_factory.h" 47 #include "ash/shell_factory.h"
47 #include "ash/touch/touch_hud_debug.h" 48 #include "ash/touch/touch_hud_debug.h"
48 #include "ash/touch/touch_hud_projection.h" 49 #include "ash/touch/touch_hud_projection.h"
49 #include "ash/touch/touch_observer_hud.h" 50 #include "ash/touch/touch_observer_hud.h"
50 #include "ash/wm/lock_layout_manager.h" 51 #include "ash/wm/lock_layout_manager.h"
51 #include "ash/wm/panels/attached_panel_window_targeter.h" 52 #include "ash/wm/panels/attached_panel_window_targeter.h"
52 #include "ash/wm/panels/panel_window_event_handler.h" 53 #include "ash/wm/panels/panel_window_event_handler.h"
(...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 aura::Window* primary_root_window = Shell::GetInstance() 978 aura::Window* primary_root_window = Shell::GetInstance()
978 ->window_tree_host_manager() 979 ->window_tree_host_manager()
979 ->GetPrimaryRootWindow(); 980 ->GetPrimaryRootWindow();
980 return GetRootWindowSettings(primary_root_window)->controller; 981 return GetRootWindowSettings(primary_root_window)->controller;
981 } 982 }
982 983
983 return GetRootWindowSettings(root_window)->controller; 984 return GetRootWindowSettings(root_window)->controller;
984 } 985 }
985 986
986 } // namespace ash 987 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/screen_ash.cc ('k') | ash/screen_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698