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 328 matching lines @@
 
   // 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));
   }
 
+  const gfx::Range height_range = GetImeListViewRange();
+
   // Adds IME list to the bubble.
   ime_list_view_ = new ImeListView(nullptr, ShouldShowKeyboardToggle(),
-                                   ImeListView::SHOW_SINGLE_IME);
+                                   ImeListView::SHOW_SINGLE_IME, height_range);
 
   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()));
+  if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
+    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()));
+    }
   }
   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()) {
@@ skipping 187 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