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

Unified Diff: ash/system/status_area_widget.h

Issue 1659283002: ash: Explicitly teach various components about ShelfLayoutManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ozone-ui-event-platform-event
Patch Set: fix-test Created 4 years, 11 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_widget.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/status_area_widget.h
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h
index b227b5da04d96d65bfdd1a4b14c8e3d3572be048..8695ccd970db12c38f1e7e9a96ba4d7020b664f2 100644
--- a/ash/system/status_area_widget.h
+++ b/ash/system/status_area_widget.h
@@ -13,6 +13,7 @@
namespace ash {
class OverviewButtonTray;
+class ShelfWidget;
class ShellDelegate;
class StatusAreaWidgetDelegate;
class SystemTray;
@@ -26,7 +27,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
public:
static const char kNativeViewName[];
- explicit StatusAreaWidget(aura::Window* status_container);
+ StatusAreaWidget(aura::Window* status_container, ShelfWidget* shelf_widget);
~StatusAreaWidget() override;
// Creates the SystemTray, WebNotificationTray and LogoutButtonTray.
@@ -57,6 +58,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
OverviewButtonTray* overview_button_tray() {
return overview_button_tray_;
}
+ ShelfWidget* shelf_widget() { return shelf_widget_; }
user::LoginStatus login_status() const { return login_status_; }
@@ -95,6 +97,8 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
#endif
user::LoginStatus login_status_;
+ ShelfWidget* shelf_widget_;
+
DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
};
« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698