From d44efe090c5dd46b2857aaaca9c939dfbb3cba0b Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Tue, 18 Dec 2012 06:08:18 +0000 Subject: events: Update mouse-event handlers to not return EventResult. This is the last step. Once this is done, we can possibly hide EventResult. BUG=163618 Review URL: https://codereview.chromium.org/11592011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173653 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/tooltips/tooltip_controller.cc | 3 +-- ash/tooltips/tooltip_controller.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'ash/tooltips') diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index ef80f9b..391b4a6 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -259,7 +259,7 @@ void TooltipController::OnKeyEvent(ui::KeyEvent* event) { } } -ui::EventResult TooltipController::OnMouseEvent(ui::MouseEvent* event) { +void TooltipController::OnMouseEvent(ui::MouseEvent* event) { aura::Window* target = static_cast(event->target()); switch (event->type()) { case ui::ET_MOUSE_MOVED: @@ -298,7 +298,6 @@ ui::EventResult TooltipController::OnMouseEvent(ui::MouseEvent* event) { default: break; } - return ui::ER_UNHANDLED; } void TooltipController::OnTouchEvent(ui::TouchEvent* event) { diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h index 6ac7b27..5f2215a 100644 --- a/ash/tooltips/tooltip_controller.h +++ b/ash/tooltips/tooltip_controller.h @@ -45,7 +45,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient, // Overridden from ui::EventHandler. virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; // Overridden from SessionStateController. -- cgit v1.1