| Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| index 8231fbdc0a6ee34611e2fdad1955b4ae696ef4c5..8e19a97e826b14e9f023ede62dfc68daa2938861 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| @@ -33,6 +33,7 @@
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
|
| #include "chrome/browser/chromeos/events/system_key_event_listener.h"
|
| +#include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h"
|
| #include "chrome/browser/chromeos/input_method/input_method_util.h"
|
| #include "chrome/browser/chromeos/login/login_wizard.h"
|
| #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
|
| @@ -255,6 +256,18 @@
|
| : l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY);
|
| }
|
|
|
| +void SystemTrayDelegateChromeOS::SwitchIME(const std::string& ime_id) {
|
| + input_method::InputMethodManager::Get()
|
| + ->GetActiveIMEState()
|
| + ->ChangeInputMethod(ime_id, false /* show_message */);
|
| + input_method::InputMethodSwitchRecorder::Get()->RecordSwitch(
|
| + true /* by_tray_menu */);
|
| +}
|
| +
|
| +void SystemTrayDelegateChromeOS::ActivateIMEProperty(const std::string& key) {
|
| + input_method::InputMethodManager::Get()->ActivateInputMethodMenuItem(key);
|
| +}
|
| +
|
| ash::NetworkingConfigDelegate*
|
| SystemTrayDelegateChromeOS::GetNetworkingConfigDelegate() const {
|
| return networking_config_delegate_.get();
|
|
|