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

Unified Diff: ash/root_window_controller.cc

Issue 2279533002: ash: Convert ShelfDelegate to use WmShelf* instead of Shelf* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: curlies Created 4 years, 4 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/mus/shell_delegate_mus.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('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 e061b02bafd9e8298246cecb006914ba6d00b594..7b32c256fab9e14aec8357d20d002d62c1af319b 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -478,7 +478,7 @@ void RootWindowController::CreateShelf() {
// Must be initialized before the delegate is notified because the delegate
// may try to access the WmShelf.
wm_shelf_aura_->SetShelf(shelf_.get());
- WmShell::Get()->shelf_delegate()->OnShelfCreated(shelf_.get());
+ WmShell::Get()->shelf_delegate()->OnShelfCreated(wm_shelf_aura_.get());
if (panel_layout_manager_)
panel_layout_manager_->SetShelf(wm_shelf_aura_.get());
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698