diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 16:18:08 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 16:18:08 +0000 |
| commit | 6f34b4836f777a3c325ded3256b313c030fc3568 (patch) | |
| tree | eae5bf57b0b2fe311894d5da221fc254882d57b9 /ash/tooltips | |
| parent | 4d1e595f9c36f20be4aa2fee6e15a95c650a72a9 (diff) | |
| download | chromium_src-6f34b4836f777a3c325ded3256b313c030fc3568.zip chromium_src-6f34b4836f777a3c325ded3256b313c030fc3568.tar.gz chromium_src-6f34b4836f777a3c325ded3256b313c030fc3568.tar.bz2 | |
events: Update scroll and touch handlers to not return EventResult.
BUG=163618
Review URL: https://codereview.chromium.org/11568006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 3 | ||||
| -rw-r--r-- | ash/tooltips/tooltip_controller.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index 1639419dd..21dcab5 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -302,7 +302,7 @@ ui::EventResult TooltipController::OnMouseEvent(ui::MouseEvent* event) { return ui::ER_UNHANDLED; } -ui::EventResult TooltipController::OnTouchEvent(ui::TouchEvent* event) { +void TooltipController::OnTouchEvent(ui::TouchEvent* event) { // TODO(varunjain): need to properly implement tooltips for // touch events. // Hide the tooltip for touch events. @@ -311,7 +311,6 @@ ui::EventResult TooltipController::OnTouchEvent(ui::TouchEvent* event) { if (tooltip_window_) tooltip_window_->RemoveObserver(this); tooltip_window_ = NULL; - return ui::ER_UNHANDLED; } void TooltipController::OnSessionStateEvent( diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h index dc21527..d07f181 100644 --- a/ash/tooltips/tooltip_controller.h +++ b/ash/tooltips/tooltip_controller.h @@ -46,7 +46,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient, // Overridden from ui::EventHandler. virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; // Overridden from SessionStateController. virtual void OnSessionStateEvent(SessionStateObserver::EventType event) |