Fix regression where no IMEs appear in the opt-in IME menu

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 134 matching lines @@
         views::CreateSolidSidedBorder(0, 0, kSeparatorWidth, 0,
                                       kHorizontalSeparatorColor),
         gfx::Insets(kMenuSeparatorVerticalPadding - kSeparatorWidth, 0)));
     auto* box_layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
     box_layout->set_minimum_cross_axis_size(
         GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT));
     SetLayoutManager(box_layout);
     auto title_label =
         new views::Label(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_IME));
-    title_label->SetBorder(views::CreateEmptyBorder(
-        0, kMenuEdgeEffectivePadding, kTrayMenuBottomRowPadding, 0));
+    title_label->SetBorder(
+        views::CreateEmptyBorder(0, kMenuEdgeEffectivePadding, 1, 0));
     title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::TITLE);
     style.SetupLabel(title_label);
 
     AddChildView(title_label);
     box_layout->SetFlexForView(title_label, 1);
 
     if (show_settings_button) {
       settings_button_ = CreateImeMenuButton(
           this, kSystemMenuSettingsIcon, IDS_ASH_STATUS_TRAY_IME_SETTINGS, 0);
@@ skipping 162 matching lines @@
   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:
-  ImeMenuListView(SystemTrayItem* owner,
-                  bool show_keyboard_toggle,
-                  SingleImeBehavior single_ime_behavior)
-      : ImeListView(owner, show_keyboard_toggle, single_ime_behavior) {
+  ImeMenuListView(SystemTrayItem* owner) : ImeListView(owner) {
     set_should_focus_ime_after_selection_with_keyboard(true);
   }
 
   ~ImeMenuListView() override {}
 
  protected:
   void Layout() override {
     gfx::Range height_range = GetImeListViewRange();
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       scroller()->ClipHeightTo(height_range.start(), height_range.end());
@@ skipping 77 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));
   }
 
   // Adds IME list to the bubble.
-  ime_list_view_ = new ImeMenuListView(nullptr, ShouldShowKeyboardToggle(),
-                                       ImeListView::SHOW_SINGLE_IME);
+  ime_list_view_ = new ImeMenuListView(nullptr);
+  ime_list_view_->Init(ShouldShowKeyboardToggle(),
+                       ImeListView::SHOW_SINGLE_IME);
   bubble_view->AddChildView(ime_list_view_);
 
   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
     // shown in the title row.
     bubble_view->AddChildView(
         new ImeButtonsView(this, false, false, false, true));
   }
@@ skipping 210 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