chromeos: Remove some IME methods from ash::SystemTrayDelegate

ash/system/ime_menu/ime_list_view.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/system/ime_menu/ime_list_view.h"
 
+#include "ash/ime/ime_switch_type.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/tray/actionable_view.h"
 #include "ash/system/tray/ime_info.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_popup_header_button.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
+#include "base/metrics/histogram_macros.h"
 #include "ui/accessibility/ax_node_data.h"
+#include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/toggle_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
+using chromeos::input_method::InputMethodManager;
+
 namespace ash {
 namespace {
 
 const int kMinFontSizeDelta = -10;
 
 // Represents a row in the scrollable IME list; each row is either an IME or
 // an IME property. A checkmark icon is shown in the row if selected.
 class ImeListItemView : public ActionableView {
  public:
   ImeListItemView(SystemTrayItem* owner,
@@ skipping 235 matching lines @@
 }
 
 void ImeListView::PrependKeyboardStatusRow() {
   DCHECK(!keyboard_status_row_);
   keyboard_status_row_ = new KeyboardStatusRow;
   keyboard_status_row_->Init(this);
   scroll_content()->AddChildViewAt(keyboard_status_row_, 0);
 }
 
 void ImeListView::HandleViewClicked(views::View* view) {
-  SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
   std::map<views::View*, std::string>::const_iterator ime = ime_map_.find(view);
   if (ime != ime_map_.end()) {
     ShellPort::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SWITCH_MODE);
     std::string ime_id = ime->second;
     last_selected_item_id_ = ime_id;
-    delegate->SwitchIME(ime_id);
+    InputMethodManager::Get()->GetActiveIMEState()->ChangeInputMethod(
+        ime_id, false /* show_message */);
+    UMA_HISTOGRAM_ENUMERATION("InputMethod.ImeSwitch", ImeSwitchType::kTray,
+                              ImeSwitchType::kCount);
+
   } else {
     std::map<views::View*, std::string>::const_iterator property =
         property_map_.find(view);
     if (property == property_map_.end())
       return;
     const std::string key = property->second;
     last_selected_item_id_ = key;
-    delegate->ActivateIMEProperty(key);
+    InputMethodManager::Get()->ActivateInputMethodMenuItem(key);
   }
 
   if (!should_focus_ime_after_selection_with_keyboard_ ||
       !last_item_selected_with_keyboard_) {
     CloseImeListView();
   }
 }
 
 void ImeListView::HandleButtonPressed(views::Button* sender,
                                       const ui::Event& event) {
@@ skipping 37 matching lines @@
 ImeListViewTestApi::ImeListViewTestApi(ImeListView* ime_list_view)
     : ime_list_view_(ime_list_view) {}
 
 ImeListViewTestApi::~ImeListViewTestApi() {}
 
 views::View* ImeListViewTestApi::GetToggleView() const {
   return ime_list_view_->keyboard_status_row_->toggle();
 }
 
 }  // namespace ash