Merge 2277753006 into M54.

ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

 // Copyright 2016 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/common/system/chromeos/ime_menu/ime_menu_tray.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
@@ skipping 41 matching lines @@
 };
 
 TrayPopupHeaderButton* CreateImeMenuButton(views::ButtonListener* listener,
                                            int enabled_resource_id,
                                            int disabled_resource_id,
                                            int enabled_resource_id_hover,
                                            int disabled_resource_id_hover,
                                            int accessible_name_id,
                                            int message_id,
                                            int right_border) {
-  TrayPopupHeaderButton* button = new ash::TrayPopupHeaderButton(
-      listener, enabled_resource_id, disabled_resource_id,
-      enabled_resource_id_hover, disabled_resource_id_hover,
-      accessible_name_id);
+  TrayPopupHeaderButton* button =
+      new TrayPopupHeaderButton(listener, enabled_resource_id,
+                                disabled_resource_id, enabled_resource_id_hover,
+                                disabled_resource_id_hover, accessible_name_id);
   button->SetTooltipText(l10n_util::GetStringUTF16(message_id));
   button->SetBorder(views::Border::CreateSolidSidedBorder(0, 0, 0, right_border,
                                                           kBorderDarkColor));
   return button;
 }
 
 class ImeButtonsView : public views::View, public views::ButtonListener {
  public:
   ImeButtonsView(bool show_emoji_button,
                  bool show_voice_button,
@@ skipping 71 matching lines @@
 
 ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf), label_(new ImeMenuLabel()) {
   SetupLabelForTray(label_);
   tray_container()->AddChildView(label_);
   SetContentsBackground();
   WmShell::Get()->system_tray_notifier()->AddIMEObserver(this);
 }
 
 ImeMenuTray::~ImeMenuTray() {
+  if (bubble_)
+    bubble_->bubble_view()->reset_delegate();
   WmShell::Get()->system_tray_notifier()->RemoveIMEObserver(this);
 }
 
 void ImeMenuTray::SetShelfAlignment(ShelfAlignment alignment) {
   TrayBackgroundView::SetShelfAlignment(alignment);
-  if (!ash::MaterialDesignController::IsShelfMaterial())
+  if (!MaterialDesignController::IsShelfMaterial())
     tray_container()->SetBorder(views::Border::NullBorder());
 }
 
 base::string16 ImeMenuTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME);
 }
 
 void ImeMenuTray::HideBubbleWithView(const views::TrayBubbleView* bubble_view) {
   if (bubble_->bubble_view() == bubble_view)
     HideImeMenuBubble();
 }
 
 void ImeMenuTray::ClickedOutsideBubble() {
   HideImeMenuBubble();
 }
 
 bool ImeMenuTray::PerformAction(const ui::Event& event) {
   if (bubble_)
     HideImeMenuBubble();
   else
     ShowImeMenuBubble();
   return true;
 }
 
 void ImeMenuTray::OnIMERefresh() {
   UpdateTrayLabel();
+  if (bubble_ && ime_list_view_) {
+    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+    IMEInfoList list;
+    delegate->GetAvailableIMEList(&list);
+    IMEPropertyInfoList property_list;
+    delegate->GetCurrentIMEProperties(&property_list);
+    ime_list_view_->Update(list, property_list, false,
+                           ImeListView::SHOW_SINGLE_IME);
+  }
 }
 
 void ImeMenuTray::OnIMEMenuActivationChanged(bool is_activated) {
   SetVisible(is_activated);
   if (is_activated)
     UpdateTrayLabel();
   else
     HideImeMenuBubble();
 }
 
 void ImeMenuTray::BubbleViewDestroyed() {
-  SetDrawBackgroundAsActive(false);
 }
 
 void ImeMenuTray::OnMouseEnteredView() {}
 
 void ImeMenuTray::OnMouseExitedView() {}
 
 base::string16 ImeMenuTray::GetAccessibleNameForBubble() {
   return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME);
 }
 
@@ skipping 49 matching lines @@
       kTrayPopupMinWidth, kTrayPopupMaxWidth);
   init_params.first_item_has_no_margin = true;
   init_params.can_activate = true;
   init_params.close_on_deactivate = true;
 
   views::TrayBubbleView* bubble_view =
       views::TrayBubbleView::Create(tray_container(), this, &init_params);
   bubble_view->set_margins(gfx::Insets(7, 0, 0, 0));
   bubble_view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
 
-  ImeListView* ime_list_view =
+  // Adds IME list to the bubble.
+  ime_list_view_ =
       new ImeListView(nullptr, false, ImeListView::SHOW_SINGLE_IME);
-  if (ime_list_view->scroll_content()->height() > GetImeListViewMaxHeight()) {
-    ime_list_view->scroller()->SetFixedSize(
+  if (ime_list_view_->scroll_content()->height() > GetImeListViewMaxHeight()) {
+    ime_list_view_->scroller()->SetFixedSize(
         gfx::Size(kTrayPopupMaxWidth, GetImeListViewMaxHeight()));
   }
-  // Adds IME list to the bubble.
-  bubble_view->AddChildView(ime_list_view);
+  bubble_view->AddChildView(ime_list_view_);
 
   // Adds IME buttons to the bubble if needed.
   LoginStatus login =
       WmShell::Get()->system_tray_delegate()->GetUserLoginStatus();
   if (login != LoginStatus::NOT_LOGGED_IN && login != LoginStatus::LOCKED &&
       !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen())
     bubble_view->AddChildView(new ImeButtonsView(false, false, false, true));
 
-  bubble_.reset(new ash::TrayBubbleWrapper(this, bubble_view));
+  bubble_.reset(new TrayBubbleWrapper(this, bubble_view));
   SetDrawBackgroundAsActive(true);
 }
 
 void ImeMenuTray::HideImeMenuBubble() {
   bubble_.reset();
+  ime_list_view_ = nullptr;
   SetDrawBackgroundAsActive(false);
 }
 
 }  // namespace ash