diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-19 06:06:00 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-19 06:06:00 +0000 |
| commit | 131fc97e5a6763f99aa57a8c58f9fd204851e196 (patch) | |
| tree | 9e9a5acac587de2aa3870aa4336037356c124031 /ash/system/ime | |
| parent | 74345af2a98e16cd1157a74ff90aa6a95688446a (diff) | |
| download | chromium_src-131fc97e5a6763f99aa57a8c58f9fd204851e196.zip chromium_src-131fc97e5a6763f99aa57a8c58f9fd204851e196.tar.gz chromium_src-131fc97e5a6763f99aa57a8c58f9fd204851e196.tar.bz2 | |
Popup detailed view for IME switch when the tray icon is not visible.
BUG=120576
TEST=manually done on lumpy
Review URL: https://chromiumcodereview.appspot.com/10083039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/ime')
| -rw-r--r-- | ash/system/ime/tray_ime.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc index 2cba5c9..89b5802 100644 --- a/ash/system/ime/tray_ime.cc +++ b/ash/system/ime/tray_ime.cc @@ -12,6 +12,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_item_more.h" #include "ash/system/tray/tray_views.h" +#include "ash/wm/shelf_layout_manager.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "grit/ash_strings.h" @@ -235,6 +236,8 @@ void TrayIME::OnIMERefresh() { default_->UpdateLabel(current); if (detailed_.get()) detailed_->Update(list, property_list); + else if (!Shell::GetInstance()->shelf()->IsVisible()) + PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); } } // namespace internal |