Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6011)

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 9999018: chrome/browser/chromeos/input_method/ refactoring [part 6 of 6] (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, remove preferences.h and language_preference.* from this CL Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f1f5f260e6ed6fc319426becc12eeaa1f5a751bb..893a3d6dde341afe2a40c8955d3524c93fb4d7b0 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,
@@ -837,22 +836,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();
}

Powered by Google App Engine
This is Rietveld 408576698