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

Unified Diff: ash/common/shelf/shelf_widget.h

Issue 2304443002: ash: Move ShelfWidget ownership to WmShelf and refactor access to it (Closed)
Patch Set: typo Created 4 years, 4 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
Index: ash/common/shelf/shelf_widget.h
diff --git a/ash/common/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h
index 1db458c9cf41e5d034b98bf46f9d2e52d9fef2c3..0b4a6db0b871e621f670f0c83d0d3460deb6ab84 100644
--- a/ash/common/shelf/shelf_widget.h
+++ b/ash/common/shelf/shelf_widget.h
@@ -34,11 +34,11 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
public ShelfBackgroundAnimatorObserver,
public ShelfLayoutManagerObserver {
public:
- ShelfWidget(WmWindow* shelf_container,
- WmWindow* status_container,
- WmShelf* wm_shelf);
+ ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf);
~ShelfWidget() override;
+ void CreateStatusAreaWidget(WmWindow* status_container);
+
// Returns if shelf alignment option is enabled, and the user is able to
// adjust the alignment (guest and supervised mode users cannot for example).
static bool ShelfAlignmentAllowed();
@@ -130,6 +130,9 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
// Owned by the shelf container's window.
ShelfLayoutManager* shelf_layout_manager_;
+
+ // Owned by the native widget.
+ // TODO(jamescook): Move to WmShelf.
StatusAreaWidget* status_area_widget_;
// |delegate_view_| is the contents view of this widget and is cleaned up

Powered by Google App Engine
This is Rietveld 408576698