diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 00:21:19 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 00:21:19 +0000 |
| commit | 35982cabf2b13ce950df6ebe16c5a27c73739de1 (patch) | |
| tree | 4a9f89cb97ef00daf76c0906a5b4d633c060cd1b /ash/tooltips | |
| parent | 5eaad14fe38fb7c9776df599f18df6cb0476b0c6 (diff) | |
| download | chromium_src-35982cabf2b13ce950df6ebe16c5a27c73739de1.zip chromium_src-35982cabf2b13ce950df6ebe16c5a27c73739de1.tar.gz chromium_src-35982cabf2b13ce950df6ebe16c5a27c73739de1.tar.bz2 | |
Show tooltips on ash tray network items.
BUG=136588
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10876091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index ed2528f..e3ec0ea 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -264,9 +264,7 @@ bool TooltipController::PreHandleMouseEvent(aura::Window* target, if (tooltip_timer_.IsRunning()) tooltip_timer_.Reset(); - // We update the tooltip if it is visible, or if we force-hid it due to a - // mouse press. - if (GetTooltip()->IsVisible() || tooltip_window_at_mouse_press_) + if (GetTooltip()->IsVisible()) UpdateIfRequired(); break; case ui::ET_MOUSE_PRESSED: |