diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 18:37:37 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 18:37:37 +0000 |
| commit | df5c4d48afa1b512c907d4169edb10b522840963 (patch) | |
| tree | 26ccf87dbecbec150301ec965e8b3ee3b48f5cb1 /ash | |
| parent | 0c14577c9905bd8161159ec7eaac810c594508d0 (diff) | |
| download | chromium_src-df5c4d48afa1b512c907d4169edb10b522840963.zip chromium_src-df5c4d48afa1b512c907d4169edb10b522840963.tar.gz chromium_src-df5c4d48afa1b512c907d4169edb10b522840963.tar.bz2 | |
[aura] tooltip still shows after touch move event out of the target widget.
Patch by Junmin Zhu <junmin.zhu@intel.com>
Original code review LGTM'd at http://codereview.chromium.org/9063001/
BUG=108906
TEST=manually
TBR=varunjain@chromium.org
Review URL: http://codereview.chromium.org/9112028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index 78d3475..9c77d2d 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -259,6 +259,14 @@ bool TooltipController::PreHandleMouseEvent(aura::Window* target, ui::TouchStatus TooltipController::PreHandleTouchEvent( aura::Window* target, aura::TouchEvent* event) { + // TODO(varunjain): need to properly implement tooltips for + // touch events. + // Hide the tooltip for touch events. + if (tooltip_->IsVisible()) + tooltip_->Hide(); + if (tooltip_window_) + tooltip_window_->RemoveObserver(this); + tooltip_window_ = NULL; return ui::TOUCH_STATUS_UNKNOWN; } |