Revert of chromeos: Remove some IME methods from ash::SystemTrayDelegate

ash/system/ime_menu/ime_list_view.cc

Index: ash/system/ime_menu/ime_list_view.cc
diff --git a/ash/system/ime_menu/ime_list_view.cc b/ash/system/ime_menu/ime_list_view.cc
index d93455aca0523004442c0005d2fef19e3f1a5e78..4d9cf07ade0cb4b146108ca996e8c3368df5b45f 100644
--- a/ash/system/ime_menu/ime_list_view.cc
+++ b/ash/system/ime_menu/ime_list_view.cc
@@ -4,7 +4,6 @@
 
 #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"
@@ -20,9 +19,7 @@
 #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"
@@ -38,8 +35,6 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-using chromeos::input_method::InputMethodManager;
-
 namespace ash {
 namespace {
 
@@ -295,16 +290,13 @@
 }
 
 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;
-    InputMethodManager::Get()->GetActiveIMEState()->ChangeInputMethod(
-        ime_id, false /* show_message */);
-    UMA_HISTOGRAM_ENUMERATION("InputMethod.ImeSwitch", ImeSwitchType::kTray,
-                              ImeSwitchType::kCount);
-
+    delegate->SwitchIME(ime_id);
   } else {
     std::map<views::View*, std::string>::const_iterator property =
         property_map_.find(view);
@@ -312,7 +304,7 @@
       return;
     const std::string key = property->second;
     last_selected_item_id_ = key;
-    InputMethodManager::Get()->ActivateInputMethodMenuItem(key);
+    delegate->ActivateIMEProperty(key);
   }
 
   if (!should_focus_ime_after_selection_with_keyboard_ ||