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

Unified Diff: ash/shelf/shelf.h

Issue 2041583004: mash: Move WmShelfAura ownership to RootWindowController and init it earlier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelftypes
Patch Set: . 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/root_window_controller.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 bb962d0f5c6ec506cf7305830b0f407745a6e94e..1292e1583c39fdcc7b984ebc13cce2b6b2cd5040 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -40,7 +40,6 @@ class FocusCycler;
class ShelfDelegate;
class ShelfIconObserver;
class ShelfModel;
-class WmShelfAura;
namespace test {
class ShelfTestAPI;
@@ -155,12 +154,9 @@ class ASH_EXPORT Shelf {
// Returns ApplicationDragAndDropHost for this shelf.
app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
- WmShelfAura* wm_shelf() { return wm_shelf_.get(); }
-
private:
friend class test::ShelfTestAPI;
- std::unique_ptr<WmShelfAura> wm_shelf_;
ShelfDelegate* delegate_;
ShelfWidget* shelf_widget_;
ShelfView* shelf_view_;
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698