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

Unified Diff: ash/common/system/status_area_widget.h

Issue 2148573002: Add palette tray to ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stylus-tool-structure
Patch Set: Nits Created 4 years, 5 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/common/system/chromeos/palette/palette_tray.cc ('k') | ash/common/system/status_area_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/status_area_widget.h
diff --git a/ash/common/system/status_area_widget.h b/ash/common/system/status_area_widget.h
index a8c8c1f829049ebd8bec62ece756dd1422c6ceb4..550555f7370f7d582aeb9ba477fa5ea9079a5dcc 100644
--- a/ash/common/system/status_area_widget.h
+++ b/ash/common/system/status_area_widget.h
@@ -22,6 +22,7 @@ class WmWindow;
#if defined(OS_CHROMEOS)
class ImeMenuTray;
class LogoutButtonTray;
+class PaletteTray;
class VirtualKeyboardTray;
#endif
@@ -79,6 +80,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
void AddWebNotificationTray();
#if defined(OS_CHROMEOS)
void AddLogoutButtonTray();
+ void AddPaletteTray();
void AddVirtualKeyboardTray();
void AddImeMenuTray();
#endif
@@ -91,6 +93,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
WebNotificationTray* web_notification_tray_;
#if defined(OS_CHROMEOS)
LogoutButtonTray* logout_button_tray_;
+ PaletteTray* palette_tray_;
VirtualKeyboardTray* virtual_keyboard_tray_;
ImeMenuTray* ime_menu_tray_;
#endif
« no previous file with comments | « ash/common/system/chromeos/palette/palette_tray.cc ('k') | ash/common/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698