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

Side by Side Diff: ash/root_window_controller.cc

Issue 2791463002: mash: Remove ShelfDelegate; move functions to ShelfModel. (Closed)
Patch Set: Address comment. Created 3 years, 8 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/mus/shell_delegate_mus.cc ('k') | ash/shelf/shelf_delegate.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 <algorithm> 7 #include <algorithm>
8 #include <queue> 8 #include <queue>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/ash_constants.h" 11 #include "ash/ash_constants.h"
12 #include "ash/ash_switches.h" 12 #include "ash/ash_switches.h"
13 #include "ash/ash_touch_exploration_manager_chromeos.h" 13 #include "ash/ash_touch_exploration_manager_chromeos.h"
14 #include "ash/aura/aura_layout_manager_adapter.h" 14 #include "ash/aura/aura_layout_manager_adapter.h"
15 #include "ash/focus_cycler.h" 15 #include "ash/focus_cycler.h"
16 #include "ash/high_contrast/high_contrast_controller.h" 16 #include "ash/high_contrast/high_contrast_controller.h"
17 #include "ash/host/ash_window_tree_host.h" 17 #include "ash/host/ash_window_tree_host.h"
18 #include "ash/login_status.h" 18 #include "ash/login_status.h"
19 #include "ash/public/cpp/config.h" 19 #include "ash/public/cpp/config.h"
20 #include "ash/public/cpp/shelf_types.h" 20 #include "ash/public/cpp/shelf_types.h"
21 #include "ash/public/cpp/shell_window_ids.h" 21 #include "ash/public/cpp/shell_window_ids.h"
22 #include "ash/root_window_settings.h" 22 #include "ash/root_window_settings.h"
23 #include "ash/screen_util.h" 23 #include "ash/screen_util.h"
24 #include "ash/session/session_controller.h" 24 #include "ash/session/session_controller.h"
25 #include "ash/shelf/shelf_delegate.h"
26 #include "ash/shelf/shelf_layout_manager.h" 25 #include "ash/shelf/shelf_layout_manager.h"
27 #include "ash/shelf/shelf_widget.h" 26 #include "ash/shelf/shelf_widget.h"
28 #include "ash/shelf/shelf_window_targeter.h" 27 #include "ash/shelf/shelf_window_targeter.h"
29 #include "ash/shelf/wm_shelf.h" 28 #include "ash/shelf/wm_shelf.h"
30 #include "ash/shell.h" 29 #include "ash/shell.h"
31 #include "ash/shell_delegate.h" 30 #include "ash/shell_delegate.h"
32 #include "ash/shell_port.h" 31 #include "ash/shell_port.h"
33 #include "ash/system/status_area_layout_manager.h" 32 #include "ash/system/status_area_layout_manager.h"
34 #include "ash/system/status_area_widget.h" 33 #include "ash/system/status_area_widget.h"
35 #include "ash/system/tray/system_tray_delegate.h" 34 #include "ash/system/tray/system_tray_delegate.h"
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 EnableTouchHudProjection(); 1107 EnableTouchHudProjection();
1109 else 1108 else
1110 DisableTouchHudProjection(); 1109 DisableTouchHudProjection();
1111 } 1110 }
1112 1111
1113 RootWindowController* GetRootWindowController(const aura::Window* root_window) { 1112 RootWindowController* GetRootWindowController(const aura::Window* root_window) {
1114 return root_window ? GetRootWindowSettings(root_window)->controller : nullptr; 1113 return root_window ? GetRootWindowSettings(root_window)->controller : nullptr;
1115 } 1114 }
1116 1115
1117 } // namespace ash 1116 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/shelf/shelf_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698