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

Side by Side Diff: ash/root_window_controller.h

Issue 2401803002: Moves Shell::ShowShelf() to WmShell (Closed)
Patch Set: Created 4 years, 2 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/common/wm_shell.cc ('k') | ash/root_window_controller.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 #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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 // calling this on the root window that doesn't have a shelf will 136 // calling this on the root window that doesn't have a shelf will
137 // lead to a crash. 137 // lead to a crash.
138 SystemTray* GetSystemTray(); 138 SystemTray* GetSystemTray();
139 139
140 // True if the window can receive events on this root window. 140 // True if the window can receive events on this root window.
141 bool CanWindowReceiveEvents(aura::Window* window); 141 bool CanWindowReceiveEvents(aura::Window* window);
142 142
143 aura::Window* GetContainer(int container_id); 143 aura::Window* GetContainer(int container_id);
144 const aura::Window* GetContainer(int container_id) const; 144 const aura::Window* GetContainer(int container_id) const;
145 145
146 // Show shelf view if it was created hidden (before session has started).
147 // TODO(jamescook): Eliminate this and handle show via Shelf.
148 void ShowShelf();
149
150 // Creates the shelf for this root window and notifies observers. 146 // Creates the shelf for this root window and notifies observers.
151 void CreateShelf(); 147 void CreateShelf();
152 148
153 // Called when the login status changes after login (such as lock/unlock). 149 // Called when the login status changes after login (such as lock/unlock).
154 // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|. 150 // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
155 void UpdateAfterLoginStatusChange(LoginStatus status); 151 void UpdateAfterLoginStatusChange(LoginStatus status);
156 152
157 // Called when the brightness/grayscale animation from white to the login 153 // Called when the brightness/grayscale animation from white to the login
158 // wallpaper image has started. Starts |boot_splash_screen_|'s hiding 154 // wallpaper image has started. Starts |boot_splash_screen_|'s hiding
159 // animation (if the screen is non-NULL). 155 // animation (if the screen is non-NULL).
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 267
272 // On classic ash, returns the RootWindowController for the given |root_window|. 268 // On classic ash, returns the RootWindowController for the given |root_window|.
273 // On mus ash, returns the RootWindowController for the primary display. 269 // On mus ash, returns the RootWindowController for the primary display.
274 // See RootWindowController class comment above. 270 // See RootWindowController class comment above.
275 ASH_EXPORT RootWindowController* GetRootWindowController( 271 ASH_EXPORT RootWindowController* GetRootWindowController(
276 const aura::Window* root_window); 272 const aura::Window* root_window);
277 273
278 } // namespace ash 274 } // namespace ash
279 275
280 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 276 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698