diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 17:16:21 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 17:16:21 +0000 |
| commit | 5eebaf46e7ea120921c3fcfce64ea45047659641 (patch) | |
| tree | 6afa9a413c557de459ee0ad4c997bd26404ebffe /ash/tooltips | |
| parent | 25cc762f00cbc1904e997f789078162e51e91418 (diff) | |
| download | chromium_src-5eebaf46e7ea120921c3fcfce64ea45047659641.zip chromium_src-5eebaf46e7ea120921c3fcfce64ea45047659641.tar.gz chromium_src-5eebaf46e7ea120921c3fcfce64ea45047659641.tar.bz2 | |
events: Update key-event handlers to not return EventResult.
BUG=163618
Review URL: https://codereview.chromium.org/11570012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173171 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 21dcab5..ef80f9b 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -249,7 +249,7 @@ void TooltipController::SetTooltipsEnabled(bool enable) { UpdateTooltip(tooltip_window_); } -ui::EventResult TooltipController::OnKeyEvent(ui::KeyEvent* event) { +void TooltipController::OnKeyEvent(ui::KeyEvent* event) { // On key press, we want to hide the tooltip and not show it until change. // This is the same behavior as hiding tooltips on timeout. Hence, we can // simply simulate a timeout. @@ -257,7 +257,6 @@ ui::EventResult TooltipController::OnKeyEvent(ui::KeyEvent* event) { tooltip_shown_timer_.Stop(); TooltipShownTimerFired(); } - return ui::ER_UNHANDLED; } ui::EventResult TooltipController::OnMouseEvent(ui::MouseEvent* event) { diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h index d07f181..6ac7b27 100644 --- a/ash/tooltips/tooltip_controller.h +++ b/ash/tooltips/tooltip_controller.h @@ -44,7 +44,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient, virtual void SetTooltipsEnabled(bool enable) OVERRIDE; // Overridden from ui::EventHandler. - virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; |