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

ash/common/system/ime/tray_ime_chromeos.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/common/system/ime/tray_ime_chromeos.h"
 
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 93 matching lines @@
     SetImage(
         gfx::CreateVectorIcon(kSystemMenuKeyboardIcon, style->GetIconColor()));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IMEDefaultView);
 };
 
 class IMEDetailedView : public ImeListView {
  public:
-  IMEDetailedView(SystemTrayItem* owner,
-                  LoginStatus login,
-                  bool show_keyboard_toggle)
-      : ImeListView(owner, show_keyboard_toggle, ImeListView::HIDE_SINGLE_IME),
+  IMEDetailedView(SystemTrayItem* owner, LoginStatus login)
+      : ImeListView(owner),
         login_(login),
         settings_(nullptr),
-        settings_button_(nullptr) {
-    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
-    IMEInfoList list;
-    delegate->GetAvailableIMEList(&list);
-    IMEPropertyInfoList property_list;
-    delegate->GetCurrentIMEProperties(&property_list);
-    Update(list, property_list, show_keyboard_toggle,
-           ImeListView::HIDE_SINGLE_IME);
-  }
+        settings_button_(nullptr) {}
 
   ~IMEDetailedView() override {}
 
   void Update(const IMEInfoList& list,
               const IMEPropertyInfoList& property_list,
               bool show_keyboard_toggle,
               SingleImeBehavior single_ime_behavior) override {
     ImeListView::Update(list, property_list, show_keyboard_toggle,
                         single_ime_behavior);
     if (!MaterialDesignController::IsSystemTrayMenuMaterial() &&
@@ skipping 154 matching lines @@
 views::View* TrayIME::CreateDefaultView(LoginStatus status) {
   CHECK(default_ == NULL);
   default_ =
       new tray::IMEDefaultView(this, GetDefaultViewLabel(ime_list_.size() > 1));
   default_->SetVisible(ShouldDefaultViewBeVisible());
   return default_;
 }
 
 views::View* TrayIME::CreateDetailedView(LoginStatus status) {
   CHECK(detailed_ == NULL);
-  detailed_ =
-      new tray::IMEDetailedView(this, status, ShouldShowKeyboardToggle());
+  detailed_ = new tray::IMEDetailedView(this, status);
+  detailed_->Init(ShouldShowKeyboardToggle(), ImeListView::HIDE_SINGLE_IME);
   return detailed_;
 }
 
 void TrayIME::DestroyTrayView() {
   tray_label_ = NULL;
 }
 
 void TrayIME::DestroyDefaultView() {
   default_ = NULL;
 }
@@ skipping 28 matching lines @@
   else
     Update();
 }
 
 bool TrayIME::ShouldDefaultViewBeVisible() {
   return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 ||
                          ShouldShowKeyboardToggle());
 }
 
 }  // namespace ash