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

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: rebase 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 WorkspaceController* workspace_controller() { 118 WorkspaceController* workspace_controller() {
118 return workspace_controller_.get(); 119 return workspace_controller_.get();
119 } 120 }
120 121
121 AlwaysOnTopController* always_on_top_controller() { 122 AlwaysOnTopController* always_on_top_controller() {
122 return always_on_top_controller_.get(); 123 return always_on_top_controller_.get();
123 } 124 }
124 125
125 // Access the shelf widget associated with this root window controller, 126 // Access the shelf widget associated with this root window controller,
126 // NULL if no such shelf exists. 127 // NULL if no such shelf exists.
128 // DEPRECATED: Prefer GetShelf()->shelf_widget().
127 ShelfWidget* shelf_widget() { return shelf_widget_.get(); } 129 ShelfWidget* shelf_widget() { return shelf_widget_.get(); }
128 130
129 // Get touch HUDs associated with this root window controller. 131 // Get touch HUDs associated with this root window controller.
130 TouchHudDebug* touch_hud_debug() const { 132 TouchHudDebug* touch_hud_debug() const {
131 return touch_hud_debug_; 133 return touch_hud_debug_;
132 } 134 }
133 TouchHudProjection* touch_hud_projection() const { 135 TouchHudProjection* touch_hud_projection() const {
134 return touch_hud_projection_; 136 return touch_hud_projection_;
135 } 137 }
136 138
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 // If no window is specified (i.e. |window| is NULL), then the lockscreen 177 // If no window is specified (i.e. |window| is NULL), then the lockscreen
176 // modal container is used if the screen is currently locked. Otherwise, the 178 // modal container is used if the screen is currently locked. Otherwise, the
177 // default modal container is used. 179 // default modal container is used.
178 SystemModalContainerLayoutManager* GetSystemModalLayoutManager( 180 SystemModalContainerLayoutManager* GetSystemModalLayoutManager(
179 aura::Window* window); 181 aura::Window* window);
180 182
181 aura::Window* GetContainer(int container_id); 183 aura::Window* GetContainer(int container_id);
182 const aura::Window* GetContainer(int container_id) const; 184 const aura::Window* GetContainer(int container_id) const;
183 185
184 // Show shelf view if it was created hidden (before session has started). 186 // Show shelf view if it was created hidden (before session has started).
187 // TODO(jamescook): Eliminate this and handle show via Shelf.
185 void ShowShelf(); 188 void ShowShelf();
186 189
187 // Creates the shelf for this root window and notifies observers. 190 // Creates the shelf for this root window and notifies observers.
188 void CreateShelf(); 191 void CreateShelf();
189 192
193 // Returns the shelf controller for this root window.
194 Shelf* GetShelf() const;
195
190 // Called when the login status changes after login (such as lock/unlock). 196 // Called when the login status changes after login (such as lock/unlock).
191 // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|. 197 // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
192 void UpdateAfterLoginStatusChange(user::LoginStatus status); 198 void UpdateAfterLoginStatusChange(user::LoginStatus status);
193 199
194 // Called when the brightness/grayscale animation from white to the login 200 // Called when the brightness/grayscale animation from white to the login
195 // desktop background image has started. Starts |boot_splash_screen_|'s 201 // desktop background image has started. Starts |boot_splash_screen_|'s
196 // hiding animation (if the screen is non-NULL). 202 // hiding animation (if the screen is non-NULL).
197 void HandleInitialDesktopBackgroundAnimationStarted(); 203 void HandleInitialDesktopBackgroundAnimationStarted();
198 204
199 // Called when the wallpaper ainmation is finished. Updates |background_| 205 // Called when the wallpaper ainmation is finished. Updates |background_|
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 329
324 // On classic ash, returns the RootWindowController for the given |root_window|. 330 // On classic ash, returns the RootWindowController for the given |root_window|.
325 // On mus ash, returns the RootWindowController for the primary display. 331 // On mus ash, returns the RootWindowController for the primary display.
326 // See RootWindowController class comment above. 332 // See RootWindowController class comment above.
327 ASH_EXPORT RootWindowController* GetRootWindowController( 333 ASH_EXPORT RootWindowController* GetRootWindowController(
328 const aura::Window* root_window); 334 const aura::Window* root_window);
329 335
330 } // namespace ash 336 } // namespace ash
331 337
332 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 338 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698