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

Unified Diff: ash/shelf/shelf.h

Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix wallpaper tests again Created 4 years, 5 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/metrics/user_metrics_recorder.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf.h
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index fab107728e22d381cc6befc4c0cc107ae875b28d..5cc1fed2c84f20606ad574b688373133013cff94 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -54,7 +54,6 @@ class ASH_EXPORT Shelf {
static const char kNativeViewName[];
Shelf(ShelfModel* model,
- ShelfDelegate* delegate,
WmShelf* wm_shelf,
ShelfWidget* widget);
virtual ~Shelf();
@@ -160,7 +159,6 @@ class ASH_EXPORT Shelf {
private:
friend class test::ShelfTestAPI;
- ShelfDelegate* delegate_;
// The shelf controller. Owned by the root window controller.
WmShelf* wm_shelf_;
ShelfWidget* shelf_widget_;
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698