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

Unified Diff: ash/shelf/shelf_widget.cc

Issue 2791463002: mash: Remove ShelfDelegate; move functions to ShelfModel. (Closed)
Patch Set: Address comment. Created 3 years, 8 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.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 abaf3706c6e2dc50af15c6b28341510d64e0f56b..3d0782861afae7a43947a1206316f878d91461f6 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -11,7 +11,6 @@
#include "ash/shelf/app_list_button.h"
#include "ash/shelf/shelf_background_animator_observer.h"
#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_delegate.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_view.h"
#include "ash/shelf/wm_shelf.h"
@@ -229,9 +228,7 @@ void ShelfWidget::OnShelfAlignmentChanged() {
ShelfView* ShelfWidget::CreateShelfView() {
DCHECK(!shelf_view_);
-
- shelf_view_ = new ShelfView(Shell::Get()->shelf_model(),
- Shell::Get()->shelf_delegate(), wm_shelf_, this);
+ shelf_view_ = new ShelfView(Shell::Get()->shelf_model(), wm_shelf_, this);
shelf_view_->Init();
GetContentsView()->AddChildView(shelf_view_);
return shelf_view_;
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698