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

Unified Diff: ash/shelf/shelf_widget.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/shelf/shelf.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget.h
diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h
index 95b72cead717eb2c2ae1ea551304ccadb716c461..8180c162acd11bb752eeca0e65c4d36bfbf31286 100644
--- a/ash/shelf/shelf_widget.h
+++ b/ash/shelf/shelf_widget.h
@@ -20,6 +20,7 @@ class FocusCycler;
class Shelf;
class ShelfLayoutManager;
class StatusAreaWidget;
+class WmShelfAura;
class WmWindow;
class WorkspaceController;
@@ -57,7 +58,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
Shelf* shelf() const { return shelf_.get(); }
StatusAreaWidget* status_area_widget() const { return status_area_widget_; }
- void CreateShelf();
+ void CreateShelf(WmShelfAura* wm_shelf_aura);
void PostCreateShelf();
// Set visibility of the shelf.
« no previous file with comments | « ash/shelf/shelf.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698