summaryrefslogtreecommitdiffstats
path: root/ash/shell.cc
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 18:01:15 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 18:01:15 +0000
commite36d2490055b26ce0bac3a61e13d29a94ceb5237 (patch)
tree9cba0574c95c408cb0e6225eb0190295db9f10c6 /ash/shell.cc
parent78b71b8f2cac334cff09fbc3df1ce28b46be1a42 (diff)
downloadchromium_src-e36d2490055b26ce0bac3a61e13d29a94ceb5237.zip
chromium_src-e36d2490055b26ce0bac3a61e13d29a94ceb5237.tar.gz
chromium_src-e36d2490055b26ce0bac3a61e13d29a94ceb5237.tar.bz2
Allow non-radio button properties in uber tray. Simplified chinese will use it.
BUG=122318 TEST=manually Review URL: http://codereview.chromium.org/10008043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
-rw-r--r--ash/shell.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index d246e6c..4dfb483 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -377,7 +377,8 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
virtual void SwitchIME(const std::string& ime_id) OVERRIDE {
}
- virtual void ActivateIMEProperty(const std::string& key) OVERRIDE {
+ virtual void ActivateIMEProperty(const std::string& key,
+ bool is_selection) OVERRIDE {
}
virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info,