Add ImeMenuTray element.

ash/system/status_area_widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/status_area_widget.h"
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/system/overview/overview_button_tray.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/wm/window_properties.h"
 #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
 
 namespace ash {
 
 StatusAreaWidget::StatusAreaWidget(WmWindow* status_container,
                                    WmShelf* wm_shelf)
     : status_area_widget_delegate_(new StatusAreaWidgetDelegate),
       overview_button_tray_(NULL),
       system_tray_(NULL),
       web_notification_tray_(NULL),
 #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) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = status_area_widget_delegate_;
   params.name = "StatusAreaWidget";
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   status_container->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           this, status_container->GetShellWindowId(), &params);
   Init(params);
   set_focus_on_creation(false);
   SetContentsView(status_area_widget_delegate_);
 }
 
 StatusAreaWidget::~StatusAreaWidget() {}
 
 void StatusAreaWidget::CreateTrayViews() {
   AddOverviewButtonTray();
   AddSystemTray();
   AddWebNotificationTray();
 #if defined(OS_CHROMEOS)
   AddLogoutButtonTray();
   AddVirtualKeyboardTray();
+  AddImeMenuTray();
 #endif
 
   SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
   DCHECK(delegate);
   // Initialize after all trays have been created.
   system_tray_->InitializeTrayItems(delegate);
   web_notification_tray_->Initialize();
 #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());
   UpdateAfterLoginStatusChange(delegate->GetUserLoginStatus());
 }
 
 void StatusAreaWidget::Shutdown() {
   // Destroy the trays early, causing them to be removed from the view
   // hierarchy. Do not used scoped pointers since we don't want to destroy them
   // in the destructor if Shutdown() is not called (e.g. in tests).
   delete web_notification_tray_;
   web_notification_tray_ = NULL;
   delete system_tray_;
   system_tray_ = NULL;
 #if defined(OS_CHROMEOS)
   delete virtual_keyboard_tray_;
   virtual_keyboard_tray_ = NULL;
   delete logout_button_tray_;
   logout_button_tray_ = NULL;
+  delete ime_menu_tray_;
+  ime_menu_tray_ = nullptr;

[sadrul, 2016/06/29 15:14:10]

the destruction order should normally be the reverse of the creation/init order.

[Azure Wei, 2016/06/30 00:36:30]

Done.

 #endif
   delete overview_button_tray_;
   overview_button_tray_ = NULL;
 }
 
 bool StatusAreaWidget::ShouldShowShelf() const {
   if ((system_tray_ && system_tray_->ShouldShowShelf()) ||
       (web_notification_tray_ &&
        web_notification_tray_->ShouldBlockShelfAutoHide()))
     return true;
@@ skipping 14 matching lines @@
            web_notification_tray_->IsMessageCenterBubbleVisible()));
 }
 
 void StatusAreaWidget::SchedulePaint() {
   status_area_widget_delegate_->SchedulePaint();
   web_notification_tray_->SchedulePaint();
   system_tray_->SchedulePaint();
 #if defined(OS_CHROMEOS)
   virtual_keyboard_tray_->SchedulePaint();
   logout_button_tray_->SchedulePaint();
+  ime_menu_tray_->SchedulePaint();
 #endif
   overview_button_tray_->SchedulePaint();
 }
 
 void StatusAreaWidget::OnNativeWidgetActivationChanged(bool active) {
   Widget::OnNativeWidgetActivationChanged(active);
   if (active)
     status_area_widget_delegate_->SetPaneFocusAndFocusDefault();
 }
 
@@ skipping 20 matching lines @@
 #if defined(OS_CHROMEOS)
 void StatusAreaWidget::AddLogoutButtonTray() {
   logout_button_tray_ = new LogoutButtonTray(this);
   status_area_widget_delegate_->AddTray(logout_button_tray_);
 }
 
 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() {
   overview_button_tray_ = new OverviewButtonTray(this);
   status_area_widget_delegate_->AddTray(overview_button_tray_);
 }
 
 void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {
   status_area_widget_delegate_->set_alignment(alignment);
   if (system_tray_)
     system_tray_->SetShelfAlignment(alignment);
   if (web_notification_tray_)
     web_notification_tray_->SetShelfAlignment(alignment);
 #if defined(OS_CHROMEOS)
   if (logout_button_tray_)
     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);
   status_area_widget_delegate_->UpdateLayout();
 }
 
 void StatusAreaWidget::SetHideSystemNotifications(bool hide) {
   if (system_tray_)
     system_tray_->SetHideNotifications(hide);
 }
 
 void StatusAreaWidget::UpdateAfterLoginStatusChange(LoginStatus login_status) {
   if (login_status_ == login_status)
     return;
   login_status_ = login_status;
   if (system_tray_)
     system_tray_->UpdateAfterLoginStatusChange(login_status);
   if (web_notification_tray_)
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 #if defined(OS_CHROMEOS)
   if (logout_button_tray_)
     logout_button_tray_->UpdateAfterLoginStatusChange(login_status);
 #endif
   if (overview_button_tray_)
     overview_button_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace ash