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

Side by Side Diff: ash/root_window_controller.h

Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to Shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: typo 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
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 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_ 5 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_
6 #define ASH_ROOT_WINDOW_CONTROLLER_H_ 6 #define ASH_ROOT_WINDOW_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } 50 }
51 51
52 namespace ash { 52 namespace ash {
53 class AshWindowTreeHost; 53 class AshWindowTreeHost;
54 class AlwaysOnTopController; 54 class AlwaysOnTopController;
55 class AnimatingDesktopController; 55 class AnimatingDesktopController;
56 class DesktopBackgroundWidgetController; 56 class DesktopBackgroundWidgetController;
57 class DockedWindowLayoutManager; 57 class DockedWindowLayoutManager;
58 class PanelLayoutManager; 58 class PanelLayoutManager;
59 class RootWindowLayoutManager; 59 class RootWindowLayoutManager;
60 class Shelf;
60 class ShelfLayoutManager; 61 class ShelfLayoutManager;
61 class ShelfWidget; 62 class ShelfWidget;
62 class StackingController; 63 class StackingController;
63 class StatusAreaWidget; 64 class StatusAreaWidget;
64 class SystemBackgroundController; 65 class SystemBackgroundController;
65 class SystemModalContainerLayoutManager; 66 class SystemModalContainerLayoutManager;
66 class SystemTray; 67 class SystemTray;
67 class TouchHudDebug; 68 class TouchHudDebug;
68 class TouchHudProjection; 69 class TouchHudProjection;
69 class WorkspaceController; 70 class WorkspaceController;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 WorkspaceController* workspace_controller() { 114 WorkspaceController* workspace_controller() {
114 return workspace_controller_.get(); 115 return workspace_controller_.get();
115 } 116 }
116 117
117 AlwaysOnTopController* always_on_top_controller() { 118 AlwaysOnTopController* always_on_top_controller() {
118 return always_on_top_controller_.get(); 119 return always_on_top_controller_.get();
119 } 120 }
120 121
121 // Access the shelf widget associated with this root window controller, 122 // Access the shelf widget associated with this root window controller,
122 // NULL if no such shelf exists. 123 // NULL if no such shelf exists.
124 // DEPRECATED: Prefer GetShelf()->shelf_widget().
123 ShelfWidget* shelf_widget() { return shelf_widget_.get(); } 125 ShelfWidget* shelf_widget() { return shelf_widget_.get(); }
124 126
125 // Get touch HUDs associated with this root window controller. 127 // Get touch HUDs associated with this root window controller.
126 TouchHudDebug* touch_hud_debug() const { 128 TouchHudDebug* touch_hud_debug() const {
127 return touch_hud_debug_; 129 return touch_hud_debug_;
128 } 130 }
129 TouchHudProjection* touch_hud_projection() const { 131 TouchHudProjection* touch_hud_projection() const {
130 return touch_hud_projection_; 132 return touch_hud_projection_;
131 } 133 }
132 134
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 // If no window is specified (i.e. |window| is NULL), then the lockscreen 173 // If no window is specified (i.e. |window| is NULL), then the lockscreen
172 // modal container is used if the screen is currently locked. Otherwise, the 174 // modal container is used if the screen is currently locked. Otherwise, the
173 // default modal container is used. 175 // default modal container is used.
174 SystemModalContainerLayoutManager* GetSystemModalLayoutManager( 176 SystemModalContainerLayoutManager* GetSystemModalLayoutManager(
175 aura::Window* window); 177 aura::Window* window);
176 178
177 aura::Window* GetContainer(int container_id); 179 aura::Window* GetContainer(int container_id);
178 const aura::Window* GetContainer(int container_id) const; 180 const aura::Window* GetContainer(int container_id) const;
179 181
180 // Show shelf view if it was created hidden (before session has started). 182 // Show shelf view if it was created hidden (before session has started).
183 // TODO(jamescook): Eliminate this and handle show via Shelf.
181 void ShowShelf(); 184 void ShowShelf();
182 185
183 // Creates the shelf for this root window and notifies observers. 186 // Creates the shelf for this root window and notifies observers.
184 void CreateShelf(); 187 void CreateShelf();
185 188
189 // Returns the shelf controller for this root window.
190 Shelf* GetShelf() const;
191
186 // Called when the login status changes after login (such as lock/unlock). 192 // Called when the login status changes after login (such as lock/unlock).
187 // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|. 193 // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
188 void UpdateAfterLoginStatusChange(user::LoginStatus status); 194 void UpdateAfterLoginStatusChange(user::LoginStatus status);
189 195
190 // Called when the brightness/grayscale animation from white to the login 196 // Called when the brightness/grayscale animation from white to the login
191 // desktop background image has started. Starts |boot_splash_screen_|'s 197 // desktop background image has started. Starts |boot_splash_screen_|'s
192 // hiding animation (if the screen is non-NULL). 198 // hiding animation (if the screen is non-NULL).
193 void HandleInitialDesktopBackgroundAnimationStarted(); 199 void HandleInitialDesktopBackgroundAnimationStarted();
194 200
195 // Called when the wallpaper ainmation is finished. Updates |background_| 201 // Called when the wallpaper ainmation is finished. Updates |background_|
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 325
320 // On classic ash, returns the RootWindowController for the given |root_window|. 326 // On classic ash, returns the RootWindowController for the given |root_window|.
321 // On mus ash, returns the RootWindowController for the primary display. 327 // On mus ash, returns the RootWindowController for the primary display.
322 // See RootWindowController class comment above. 328 // See RootWindowController class comment above.
323 ASH_EXPORT RootWindowController* GetRootWindowController( 329 ASH_EXPORT RootWindowController* GetRootWindowController(
324 const aura::Window* root_window); 330 const aura::Window* root_window);
325 331
326 } // namespace ash 332 } // namespace ash
327 333
328 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 334 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698