diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 18:02:23 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 18:02:23 +0000 |
| commit | 4598671a9075d5d320cd9f2fe2128a7c09bfc0d2 (patch) | |
| tree | 311d8753f510e266b767b36233418da2578c2211 /ash/system | |
| parent | d15225242597e1ce023ad609863e76479e7b1b18 (diff) | |
| download | chromium_src-4598671a9075d5d320cd9f2fe2128a7c09bfc0d2.zip chromium_src-4598671a9075d5d320cd9f2fe2128a7c09bfc0d2.tar.gz chromium_src-4598671a9075d5d320cd9f2fe2128a7c09bfc0d2.tar.bz2 | |
Do not display keyboard tray if there is only 1 language input method.
BUG=121451
TEST=Keyboard selection should not be displayed if there is only one input method.
Review URL: http://codereview.chromium.org/10113013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/ime/tray_ime.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc index 2cba5c9..e260389 100644 --- a/ash/system/ime/tray_ime.cc +++ b/ash/system/ime/tray_ime.cc @@ -199,6 +199,13 @@ views::View* TrayIME::CreateTrayView(user::LoginStatus status) { } views::View* TrayIME::CreateDefaultView(user::LoginStatus status) { + SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate(); + IMEInfoList list; + IMEPropertyInfoList property_list; + delegate->GetAvailableIMEList(&list); + delegate->GetCurrentIMEProperties(&property_list); + if (list.size() <= 1 && property_list.size() <= 1) + return NULL; default_.reset(new tray::IMEDefaultView(this)); return default_.get(); } |