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

Unified Diff: ash/shelf/shelf_widget.cc

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content Created 4 years, 6 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/shelf/shelf_view.cc ('k') | ash/shell/context_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget.cc
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index 20c1174c67784844667a2647915ae2d5ea46aebe..73451cd12ecd9f155bc96e9a8552c4823a09babd 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -720,7 +720,7 @@ void ShelfWidget::CreateShelf(WmShelfAura* wm_shelf_aura) {
Shell* shell = Shell::GetInstance();
ShelfDelegate* delegate = shell->GetShelfDelegate();
- shelf_.reset(new Shelf(shell->shelf_model(), delegate, this));
+ shelf_.reset(new Shelf(shell->shelf_model(), delegate, wm_shelf_aura, this));
// Must be initialized before the delegate is notified because the delegate
// may try to access the WmShelf.
wm_shelf_aura->SetShelf(shelf_.get());
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/shell/context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698