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

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

Issue 10008043: Allow non-radio button properties in uber tray. Simplified chinese will use it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rewrite ActivateIMEProperty 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
« ash/system/tray/system_tray.cc ('K') | « ash/system/tray/system_tray_delegate.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 85984fb92bbdac185de5d123d686ae84bdd0d1ac..10887c8568181ac8f5bdf8b99447c7f4d9346bdc 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -376,12 +376,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
manager->GetCurrentInputMethodProperties();
for (size_t i = 0; i < properties.size(); ++i) {
ash::IMEPropertyInfo property;
- // Do not show the item not in the selection item.
- if (!properties[i].is_selection_item)
- continue;
property.key = properties[i].key;
property.name = util->TranslateString(properties[i].label);
property.selected = properties[i].is_selection_item_checked;
+ property.is_selection = properties[i].is_selection_item;
list->push_back(property);
}
}
@@ -390,9 +388,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
input_method::InputMethodManager::GetInstance()->ChangeInputMethod(ime_id);
}
- virtual void ActivateIMEProperty(const std::string& key) OVERRIDE {
+ virtual void ActivateIMEProperty(
+ const std::string& key, bool is_selection) OVERRIDE {
input_method::InputMethodManager::GetInstance()->SetImePropertyActivated(
- key, true);
+ key, is_selection);
}
virtual void GetMostRelevantNetworkIcon(ash::NetworkIconInfo* info,
« ash/system/tray/system_tray.cc ('K') | « ash/system/tray/system_tray_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698