diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 23:00:38 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 23:00:38 +0000 |
| commit | d5e28a3e5402329a9f50075ed8d6417feeea7c71 (patch) | |
| tree | 8f902ea56c5460eefb1b878bb50bc9edd762fd36 /ash/shell.cc | |
| parent | 82114f59366794a020af471abc3c83ddfd34cde3 (diff) | |
| download | chromium_src-d5e28a3e5402329a9f50075ed8d6417feeea7c71.zip chromium_src-d5e28a3e5402329a9f50075ed8d6417feeea7c71.tar.gz chromium_src-d5e28a3e5402329a9f50075ed8d6417feeea7c71.tar.bz2 | |
ash: Add an entry for IME in the tray.
BUG=118862
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=127748
Review URL: https://chromiumcodereview.appspot.com/9751005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 395d2bf..dea9786 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -21,6 +21,7 @@ #include "ash/shell_window_ids.h" #include "ash/system/audio/tray_volume.h" #include "ash/system/brightness/tray_brightness.h" +#include "ash/system/ime/tray_ime.h" #include "ash/system/network/tray_network.h" #include "ash/system/power/power_status_observer.h" #include "ash/system/power/power_supply_status.h" @@ -314,6 +315,10 @@ class DummySystemTrayDelegate : public SystemTrayDelegate { virtual void RequestLockScreen() OVERRIDE {} + virtual IMEInfoList GetAvailableIMEList() { + return IMEInfoList(); + } + virtual NetworkIconInfo GetMostRelevantNetworkIcon(bool large) OVERRIDE { return NetworkIconInfo(); } @@ -568,12 +573,14 @@ void Shell::Init() { internal::TrayAccessibility* tray_accessibility = new internal::TrayAccessibility; internal::TrayCapsLock* tray_caps_lock = new internal::TrayCapsLock; + internal::TrayIME* tray_ime = new internal::TrayIME; tray_->accessibility_observer_ = tray_accessibility; tray_->audio_observer_ = tray_volume; tray_->brightness_observer_ = tray_brightness; tray_->caps_lock_observer_ = tray_caps_lock; tray_->clock_observer_ = tray_power_date; + tray_->ime_observer_ = tray_ime; tray_->network_observer_ = tray_network; tray_->power_status_observer_ = tray_power_date; tray_->update_observer_ = tray_user; @@ -583,6 +590,7 @@ void Shell::Init() { tray_->AddTrayItem(new internal::TrayEmpty()); tray_->AddTrayItem(tray_power_date); tray_->AddTrayItem(tray_network); + tray_->AddTrayItem(tray_ime); tray_->AddTrayItem(tray_volume); tray_->AddTrayItem(tray_brightness); tray_->AddTrayItem(new internal::TraySettings()); |