diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 15:48:17 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 15:48:17 +0000 |
| commit | a0ebaca028cd268336f1dfcb67f780ccd7cd1794 (patch) | |
| tree | bed20bf89f43396d813ce14b133f04946c8ad80b | |
| parent | 7361d47d40181c6d2f5a979033985e770b1fc52d (diff) | |
| download | chromium_src-a0ebaca028cd268336f1dfcb67f780ccd7cd1794.zip chromium_src-a0ebaca028cd268336f1dfcb67f780ccd7cd1794.tar.gz chromium_src-a0ebaca028cd268336f1dfcb67f780ccd7cd1794.tar.bz2 | |
Revert "Popup detailed view for IME switch when the tray icon is not visible."
This reverts commit 131fc97e5a6763f99aa57a8c58f9fd204851e196.
The reverted patch was working actually, but at the same time it causes some irritating behaviors, such like crbug.com/124255
BUG=124255,120576
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10153009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133202 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/system/ime/tray_ime.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc index 89b5802..2cba5c9 100644 --- a/ash/system/ime/tray_ime.cc +++ b/ash/system/ime/tray_ime.cc @@ -12,7 +12,6 @@ #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" @@ -236,8 +235,6 @@ 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 |