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

Unified Diff: ash/shelf/shelf.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.h ('k') | ash/shelf/shelf_alignment_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf.cc
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index f75908b4aef729c75f85c9ad3347bfef0847c935..cbc1e15c4b9f37fb03aeeacba823d785f5afedbb 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -44,11 +44,14 @@ const char Shelf::kNativeViewName[] = "ShelfView";
Shelf::Shelf(ShelfModel* shelf_model,
ShelfDelegate* shelf_delegate,
+ WmShelf* wm_shelf,
ShelfWidget* shelf_widget)
: delegate_(shelf_delegate),
+ wm_shelf_(wm_shelf),
shelf_widget_(shelf_widget),
- shelf_view_(new ShelfView(shelf_model, delegate_, this)),
+ shelf_view_(new ShelfView(shelf_model, delegate_, wm_shelf, this)),
shelf_locking_manager_(this) {
+ DCHECK(wm_shelf_);
shelf_view_->Init();
shelf_widget_->GetContentsView()->AddChildView(shelf_view_);
shelf_widget_->GetNativeView()->SetName(kNativeViewName);
« no previous file with comments | « ash/shelf/shelf.h ('k') | ash/shelf/shelf_alignment_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698