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

Unified Diff: ash/system/status_area_widget.h

Issue 196473011: Attempting to reland the Overview Button Change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge in updates from Master Created 6 years, 9 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/system/overview/overview_button_tray_unittest.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 f73ce22a8047ad1ee57e1e1d93158f302aab9c3a..ad1c6dd5cdad4f33ae8ef81a81cff882c61f8418 100644
--- a/ash/system/status_area_widget.h
+++ b/ash/system/status_area_widget.h
@@ -12,6 +12,7 @@
namespace ash {
+class OverviewButtonTray;
class ShellDelegate;
class SystemTray;
class WebNotificationTray;
@@ -56,6 +57,9 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
WebNotificationTray* web_notification_tray() {
return web_notification_tray_;
}
+ OverviewButtonTray* overview_button_tray() {
+ return overview_button_tray_;
+ }
user::LoginStatus login_status() const { return login_status_; }
@@ -77,9 +81,11 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
void AddLogoutButtonTray();
void AddVirtualKeyboardTray();
#endif
+ void AddOverviewButtonTray();
// Weak pointers to View classes that are parented to StatusAreaWidget:
internal::StatusAreaWidgetDelegate* status_area_widget_delegate_;
+ OverviewButtonTray* overview_button_tray_;
SystemTray* system_tray_;
WebNotificationTray* web_notification_tray_;
#if defined(OS_CHROMEOS)
« no previous file with comments | « ash/system/overview/overview_button_tray_unittest.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698