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

Unified Diff: ash/mus/bridge/wm_shelf_mus.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/common/shelf/wm_shelf.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shelf_mus.cc
diff --git a/ash/mus/bridge/wm_shelf_mus.cc b/ash/mus/bridge/wm_shelf_mus.cc
index abbe426156a63a4117001d9189e260a122ce3f89..951ee63f196efa2978ceef27e5e05adf8ef9e1e1 100644
--- a/ash/mus/bridge/wm_shelf_mus.cc
+++ b/ash/mus/bridge/wm_shelf_mus.cc
@@ -28,7 +28,7 @@ WmShelfMus::WmShelfMus(WmRootWindowController* root_window_controller) {
// Must be initialized before the delegate is notified because the delegate
// may try to access the WmShelf.
SetShelf(shelf_.get());
- WmShell::Get()->shelf_delegate()->OnShelfCreated(shelf_.get());
+ WmShell::Get()->shelf_delegate()->OnShelfCreated(this);
WmShell::Get()->NotifyShelfCreatedForRootWindow(root);
shelf_widget_->PostCreateShelf();
}
« no previous file with comments | « ash/common/shelf/wm_shelf.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698