Add ImeMenuTray element.

ash/system/status_area_widget.cc

Index: ash/system/status_area_widget.cc
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 1cdc306325a52dcdb7c987d63469968c46ba4681..c119d975986a493869a3cb0cb79f0634cdb9b6cb 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -18,6 +18,7 @@
 #include "base/i18n/time_formatting.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/system/chromeos/ime_menu/ime_menu_tray.h"
 #include "ash/system/chromeos/session/logout_button_tray.h"
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
 #endif
@@ -33,6 +34,7 @@ StatusAreaWidget::StatusAreaWidget(WmWindow* status_container,
 #if defined(OS_CHROMEOS)
       logout_button_tray_(NULL),
       virtual_keyboard_tray_(NULL),
+      ime_menu_tray_(nullptr),
 #endif
       login_status_(LoginStatus::NOT_LOGGED_IN),
       wm_shelf_(wm_shelf) {
@@ -59,6 +61,7 @@ void StatusAreaWidget::CreateTrayViews() {
 #if defined(OS_CHROMEOS)
   AddLogoutButtonTray();
   AddVirtualKeyboardTray();
+  AddImeMenuTray();
 #endif
 
   SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
@@ -69,6 +72,7 @@ void StatusAreaWidget::CreateTrayViews() {
 #if defined(OS_CHROMEOS)
   logout_button_tray_->Initialize();
   virtual_keyboard_tray_->Initialize();
+  ime_menu_tray_->Initialize();
 #endif
   overview_button_tray_->Initialize();
   SetShelfAlignment(system_tray_->shelf_alignment());
@@ -88,6 +92,8 @@ void StatusAreaWidget::Shutdown() {
   virtual_keyboard_tray_ = NULL;
   delete logout_button_tray_;
   logout_button_tray_ = NULL;
+  delete ime_menu_tray_;
+  ime_menu_tray_ = nullptr;
 #endif
   delete overview_button_tray_;
   overview_button_tray_ = NULL;
@@ -122,6 +128,7 @@ void StatusAreaWidget::SchedulePaint() {
 #if defined(OS_CHROMEOS)
   virtual_keyboard_tray_->SchedulePaint();
   logout_button_tray_->SchedulePaint();
+  ime_menu_tray_->SchedulePaint();
 #endif
   overview_button_tray_->SchedulePaint();
 }
@@ -162,6 +169,11 @@ void StatusAreaWidget::AddVirtualKeyboardTray() {
   virtual_keyboard_tray_ = new VirtualKeyboardTray(this);
   status_area_widget_delegate_->AddTray(virtual_keyboard_tray_);
 }
+
+void StatusAreaWidget::AddImeMenuTray() {
+  ime_menu_tray_ = new ImeMenuTray(this);
+  status_area_widget_delegate_->AddTray(ime_menu_tray_);
+}
 #endif
 
 void StatusAreaWidget::AddOverviewButtonTray() {
@@ -180,6 +192,8 @@ void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {
     logout_button_tray_->SetShelfAlignment(alignment);
   if (virtual_keyboard_tray_)
     virtual_keyboard_tray_->SetShelfAlignment(alignment);
+  if (ime_menu_tray_)
+    ime_menu_tray_->SetShelfAlignment(alignment);
 #endif
   if (overview_button_tray_)
     overview_button_tray_->SetShelfAlignment(alignment);