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

Unified Diff: ash/common/wm_shell.cc

Issue 2393083005: Moves Shell::CreateShelf() to WmShell (Closed)
Patch Set: fix shell 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/root_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index 7477fa7178ad625ca97c380d9f0cedf9545336fa..c7137bc9571675f739e58e326cf6c9cbd3cf5ccc 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -117,6 +117,16 @@ void WmShell::ShowContextMenu(const gfx::Point& location_in_screen,
source_type);
}
+void WmShell::CreateShelf() {
+ // Must occur after SessionStateDelegate creation and user login.
+ DCHECK(GetSessionStateDelegate());
+ DCHECK_GT(GetSessionStateDelegate()->NumberOfLoggedInUsers(), 0);
+ CreateShelfDelegate();
+
+ for (WmWindow* root_window : GetAllRootWindows())
+ root_window->GetRootWindowController()->CreateShelf();
+}
+
void WmShell::ShowShelf() {
for (WmWindow* root_window : GetAllRootWindows())
root_window->GetRootWindowController()->ShowShelf();
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698