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

Unified Diff: ash/root_window_controller.cc

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, 7 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/root_window_controller.h ('k') | ash/shelf/shelf.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index bf980dcc2ff36961962cf6cc04e9427e1abd021f..8135b83a5d07ac94a723c415704f9dd07a07f5ef 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -432,6 +432,11 @@ void RootWindowController::CreateShelf() {
shelf_widget_->PostCreateShelf();
}
+Shelf* RootWindowController::GetShelf() const {
+ // TODO(jamescook): Shelf should be owned by this class, not by ShelfWidget.
+ return shelf_widget_->shelf();
+}
+
void RootWindowController::UpdateAfterLoginStatusChange(
user::LoginStatus status) {
if (status != user::LOGGED_IN_NONE)
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/shelf/shelf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698