Set ImeListView's scrollable range when updating

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/accessibility_delegate.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 37 matching lines @@
 
 namespace {
 // Returns the height range of ImeListView.
 gfx::Range GetImeListViewRange() {
   const int max_items = 5;
   const int min_items = 2;
   const int tray_item_height = GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT);
   return gfx::Range(tray_item_height * min_items, tray_item_height * max_items);
 }
 
+// Returns the minimum with of IME menu.
+int GetMinimumMenuWidth() {
+  return MaterialDesignController::IsSystemTrayMenuMaterial()
+             ? kTrayMenuMinimumWidthMd
+             : kTrayMenuMinimumWidth;
+}
+
 // Shows language and input settings page.
 void ShowIMESettings() {
   WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SHOW_DETAILED);
   WmShell::Get()->system_tray_controller()->ShowIMESettings();
 }
 
 // Returns true if the current screen is login or lock screen.
 bool IsInLoginOrLockScreen() {
   LoginStatus login =
       WmShell::Get()->system_tray_delegate()->GetUserLoginStatus();
@@ skipping 218 matching lines @@
   ImeMenuTray* ime_menu_tray_;
   SystemMenuButton* emoji_button_;
   SystemMenuButton* handwriting_button_;
   SystemMenuButton* voice_button_;
   SystemMenuButton* settings_button_;
   HoverHighlightView* one_settings_button_view_;
 
   DISALLOW_COPY_AND_ASSIGN(ImeButtonsView);
 };
 
+// The list view that contains the selected IME and property items.
+class ImeMenuListView : public ImeListView {
+ public:
+  explicit ImeMenuListView(SystemTrayItem* owner,

[tdanderson, 2016/12/07 22:53:04]

nit: no 'explicit' since the constructor has more than one parameter

[Azure Wei, 2016/12/08 03:04:12]

Done. Removed 'explicit'.

+                           bool show_keyboard_toggle,
+                           SingleImeBehavior single_ime_behavior)
+      : ImeListView(owner, show_keyboard_toggle, ImeListView::HIDE_SINGLE_IME) {
+  }
+
+  ~ImeMenuListView() override {}
+
+ protected:
+  void Layout() override {
+    gfx::Range height_range = GetImeListViewRange();
+    if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+      scroller()->ClipHeightTo(height_range.start(), height_range.end());
+    } else {
+      uint32_t current_height = scroll_content()->height();
+      int minimum_menu_width = GetMinimumMenuWidth();
+      if (current_height > height_range.end()) {
+        scroller()->SetFixedSize(
+            gfx::Size(minimum_menu_width, height_range.end()));
+      } else if (current_height < height_range.start()) {
+        scroller()->SetFixedSize(
+            gfx::Size(minimum_menu_width, height_range.start()));
+      }
+    }
+    TrayDetailsView::Layout();

[tdanderson, 2016/12/07 22:53:04]

I think this should instead call up to IMEListView::Layout(). Currently that
method is not implemented so it will resolve to TrayDetailsView::Layout()
anyway, but if IMEListView::Layout() was ever provided with an implementation
then we would presumably want this method to call up to that rather than
directly up to TrayDetailsView.

[Azure Wei, 2016/12/08 03:04:12]

Yes, this should be ImeListView::Layout(). Thanks.

+  }
+
+  DISALLOW_COPY_AND_ASSIGN(ImeMenuListView);
+};
+
 }  // namespace
 
 ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf),
       label_(new ImeMenuLabel()),
       show_keyboard_(false),
       force_show_keyboard_(false),
       should_block_shelf_auto_hide_(false),
       keyboard_suppressed_(false) {
   if (MaterialDesignController::IsShelfMaterial()) {
@@ skipping 11 matching lines @@
 
 ImeMenuTray::~ImeMenuTray() {
   if (bubble_)
     bubble_->bubble_view()->reset_delegate();
   SystemTrayNotifier* tray_notifier = WmShell::Get()->system_tray_notifier();
   tray_notifier->RemoveIMEObserver(this);
   tray_notifier->RemoveVirtualKeyboardObserver(this);
 }
 
 void ImeMenuTray::ShowImeMenuBubble() {
-  int minimum_menu_width = MaterialDesignController::IsSystemTrayMenuMaterial()
-                               ? kTrayMenuMinimumWidthMd
-                               : kTrayMenuMinimumWidth;
+  int minimum_menu_width = GetMinimumMenuWidth();
   should_block_shelf_auto_hide_ = true;
   views::TrayBubbleView::InitParams init_params(
       GetAnchorAlignment(), minimum_menu_width, minimum_menu_width);
   init_params.can_activate = true;
   init_params.close_on_deactivate = true;
 
   views::TrayBubbleView* bubble_view =
       views::TrayBubbleView::Create(GetBubbleAnchor(), this, &init_params);
   bubble_view->set_anchor_view_insets(GetBubbleAnchorInsets());
 
   // In the material design, we will add a title item with a separator on the
   // top of the IME menu.
   if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
     bubble_view->AddChildView(
         new ImeTitleView(!ShouldShowEmojiHandwritingVoiceButtons()));
   } else {
     bubble_view->set_margins(gfx::Insets(7, 0, 0, 0));
   }
 
   // Adds IME list to the bubble.
-  ime_list_view_ = new ImeListView(nullptr, ShouldShowKeyboardToggle(),
-                                   ImeListView::SHOW_SINGLE_IME);
-
-  uint32_t current_height = ime_list_view_->scroll_content()->height();
-  const gfx::Range height_range = GetImeListViewRange();
-
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    ime_list_view_->scroller()->ClipHeightTo(height_range.start(),
-                                             height_range.end());
-  } else if (current_height > height_range.end()) {
-    ime_list_view_->scroller()->SetFixedSize(
-        gfx::Size(minimum_menu_width, height_range.end()));
-  } else if (current_height < height_range.start()) {
-    ime_list_view_->scroller()->SetFixedSize(
-        gfx::Size(minimum_menu_width, height_range.start()));
-  }
+  ime_list_view_ = new ImeMenuListView(nullptr, ShouldShowKeyboardToggle(),
+                                       ImeListView::SHOW_SINGLE_IME);
   bubble_view->AddChildView(ime_list_view_);
 
   // The bottom view that contains buttons are not supported in login/lock
   // screen.
   if (!IsInLoginOrLockScreen()) {
     if (ShouldShowEmojiHandwritingVoiceButtons()) {
       bubble_view->AddChildView(
           new ImeButtonsView(this, true, true, true, true));
     } else if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
       // For MD, we don't need |ImeButtonsView| as the settings button will be
@@ skipping 186 matching lines @@
   WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
 
   // Updates the tray label based on the current input method.
   if (current_ime_.third_party)
     label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
   else
     label_->SetText(current_ime_.short_name);
 }
 
 }  // namespace ash