| Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| index fdd9bb5d6df93f74b9629877437e871f8fa8bd78..e59a7b2955f0c942edd2b59dc7eb0e1e70fdaace 100644
|
| --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| @@ -383,10 +383,9 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
|
| input_method::InputMethodManager::GetInstance()->ChangeInputMethod(ime_id);
|
| }
|
|
|
| - virtual void ActivateIMEProperty(
|
| - const std::string& key, bool is_selection) OVERRIDE {
|
| - input_method::InputMethodManager::GetInstance()->SetImePropertyActivated(
|
| - key, is_selection);
|
| + virtual void ActivateIMEProperty(const std::string& key) OVERRIDE {
|
| + input_method::InputMethodManager::GetInstance()->
|
| + ActivateInputMethodProperty(key);
|
| }
|
|
|
| virtual void GetMostRelevantNetworkIcon(ash::NetworkIconInfo* info,
|
| @@ -843,22 +842,12 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
|
|
|
| // Overridden from InputMethodManager::Observer.
|
| virtual void InputMethodChanged(
|
| - input_method::InputMethodManager* manager,
|
| - const input_method::InputMethodDescriptor& current_method,
|
| - size_t num_active_input_methods) OVERRIDE {
|
| + input_method::InputMethodManager* manager) OVERRIDE {
|
| NotifyRefreshIME();
|
| }
|
|
|
| - virtual void ActiveInputMethodsChanged(
|
| - input_method::InputMethodManager* manager,
|
| - const input_method::InputMethodDescriptor& current_input_method,
|
| - size_t num_active_input_methods) OVERRIDE {
|
| - NotifyRefreshIME();
|
| - }
|
| -
|
| - virtual void PropertyListChanged(
|
| - input_method::InputMethodManager* manager,
|
| - const input_method::InputMethodPropertyList& properties) OVERRIDE {
|
| + virtual void InputMethodPropertyChanged(
|
| + input_method::InputMethodManager* manager) OVERRIDE {
|
| NotifyRefreshIME();
|
| }
|
|
|
|
|