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

Unified Diff: ash/system/status_area_widget.h

Issue 1996563002: Add ImeMenuTray element. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove kStatusTrayShelfID. 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
Index: ash/system/status_area_widget.h
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h
index 2885354b0d1372ec5dcee308205d323f5869eea5..6b157b9e2501d495eb3da85d38fc3fa94119b81a 100644
--- a/ash/system/status_area_widget.h
+++ b/ash/system/status_area_widget.h
@@ -22,6 +22,7 @@ class WmWindow;
#if defined(OS_CHROMEOS)
class LogoutButtonTray;
class VirtualKeyboardTray;
+class ImeMenuTray;
sadrul 2016/06/27 15:08:05 sort
Azure Wei 2016/06/27 18:33:49 Done.
#endif
class ASH_EXPORT StatusAreaWidget : public views::Widget {
@@ -61,6 +62,10 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
LoginStatus login_status() const { return login_status_; }
+#if defined(OS_CHROMEOS)
+ ImeMenuTray* ime_menu_tray() { return ime_menu_tray_; }
+#endif
+
// Returns true if the shelf should be visible. This is used when the
// shelf is configured to auto-hide and test if the shelf should force
// the shelf to remain visible.
@@ -84,6 +89,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
#if defined(OS_CHROMEOS)
void AddLogoutButtonTray();
void AddVirtualKeyboardTray();
+ void AddImeMenuTray();
#endif
void AddOverviewButtonTray();
@@ -95,6 +101,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
#if defined(OS_CHROMEOS)
LogoutButtonTray* logout_button_tray_;
VirtualKeyboardTray* virtual_keyboard_tray_;
+ ImeMenuTray* ime_menu_tray_;
#endif
LoginStatus login_status_;

Powered by Google App Engine
This is Rietveld 408576698