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

chrome/browser/chromeos/input_method/input_method_manager_impl.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 "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 
 #include <stdint.h>
 
 #include <algorithm>  // std::find
 #include <memory>
 #include <set>
 #include <sstream>
 #include <utility>
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/hash.h"
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/ash_config.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h"
+#include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/system/devicemode.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
@@ skipping 696 matching lines @@
 }
 
 void InputMethodManagerImpl::StateImpl::SwitchToNextInputMethod() {
   DCHECK(CanCycleInputMethod());
   if (!CanCycleInputMethod())
     return;
 
   // Find the next input method and switch to it.
   SwitchToNextInputMethodInternal(active_input_method_ids,
                                   current_input_method.id());
+  InputMethodSwitchRecorder::Get()->RecordSwitch(false /* by_tray_menu*/);
 }
 
 void InputMethodManagerImpl::StateImpl::SwitchToPreviousInputMethod() {
   DCHECK(CanCycleInputMethod());
   if (!CanCycleInputMethod())
     return;
 
   if (previous_input_method.id().empty() ||
       previous_input_method.id() == current_input_method.id()) {
     SwitchToNextInputMethod();
     return;
   }
 
   std::vector<std::string>::const_iterator iter =
       std::find(active_input_method_ids.begin(),
                 active_input_method_ids.end(),
                 previous_input_method.id());
   if (iter == active_input_method_ids.end()) {
     // previous_input_method is not supported.
     SwitchToNextInputMethod();
     return;
   }
   ChangeInputMethod(*iter, true);
+  InputMethodSwitchRecorder::Get()->RecordSwitch(false /* by_tray_menu*/);
 }
 
 bool InputMethodManagerImpl::StateImpl::CanSwitchInputMethod(
     const ui::Accelerator& accelerator) {
   // If none of the input methods associated with |accelerator| are active, we
   // should ignore the accelerator. For example, we should just ignore
   // VKEY_HANGUL when mozc-hangul is not active.
   std::vector<std::string> candidate_ids;
   GetCandidateInputMethodsForAccelerator(accelerator, &candidate_ids);
   return !candidate_ids.empty();
 }
 
 void InputMethodManagerImpl::StateImpl::SwitchInputMethod(
     const ui::Accelerator& accelerator) {
   std::vector<std::string> candidate_ids;
   GetCandidateInputMethodsForAccelerator(accelerator, &candidate_ids);
   DCHECK(!candidate_ids.empty());
-  if (!candidate_ids.empty())
+  if (!candidate_ids.empty()) {
     SwitchToNextInputMethodInternal(candidate_ids, current_input_method.id());
+    InputMethodSwitchRecorder::Get()->RecordSwitch(false /* by_tray_menu*/);
+  }
 }
 
 void InputMethodManagerImpl::StateImpl::SwitchToNextInputMethodInternal(
     const std::vector<std::string>& input_method_ids,
     const std::string& current_input_methodid) {
   std::vector<std::string>::const_iterator iter = std::find(
       input_method_ids.begin(), input_method_ids.end(), current_input_methodid);
   if (iter != input_method_ids.end())
     ++iter;
   if (iter == input_method_ids.end())
@@ skipping 528 matching lines @@
   if (keyboard_controller)
     keyboard_controller->Reload();
 }
 
 bool InputMethodManagerImpl::IsEmojiHandwritingVoiceOnImeMenuEnabled() {
   return base::FeatureList::IsEnabled(features::kEHVInputOnImeMenu);
 }
 
 }  // namespace input_method
 }  // namespace chromeos