| Index: ash/launcher/launcher_tooltip_manager.cc
|
| diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc
|
| index dfc2a4b511262f199bb70d40f16832133e2f2fc8..2435d4f2c0e03595cb6c2f7d50b4c4537a4c4227 100644
|
| --- a/ash/launcher/launcher_tooltip_manager.cc
|
| +++ b/ash/launcher/launcher_tooltip_manager.cc
|
| @@ -243,11 +243,11 @@ bool LauncherTooltipManager::IsVisible() {
|
| return widget_ && widget_->IsVisible();
|
| }
|
|
|
| -ui::EventResult LauncherTooltipManager::OnMouseEvent(ui::MouseEvent* event) {
|
| +void LauncherTooltipManager::OnMouseEvent(ui::MouseEvent* event) {
|
| DCHECK(event->target());
|
| DCHECK(event);
|
| if (!widget_ || !widget_->IsVisible())
|
| - return ui::ER_UNHANDLED;
|
| + return;
|
|
|
| DCHECK(view_);
|
| DCHECK(launcher_view_);
|
| @@ -255,7 +255,7 @@ ui::EventResult LauncherTooltipManager::OnMouseEvent(ui::MouseEvent* event) {
|
| aura::Window* target = static_cast<aura::Window*>(event->target());
|
| if (widget_->GetNativeWindow()->GetRootWindow() != target->GetRootWindow()) {
|
| CloseSoon();
|
| - return ui::ER_UNHANDLED;
|
| + return;
|
| }
|
|
|
| gfx::Point location_in_launcher_view = event->location();
|
| @@ -274,8 +274,6 @@ ui::EventResult LauncherTooltipManager::OnMouseEvent(ui::MouseEvent* event) {
|
| // the closing event rather than directly calling Close().
|
| CloseSoon();
|
| }
|
| -
|
| - return ui::ER_UNHANDLED;
|
| }
|
|
|
| void LauncherTooltipManager::OnTouchEvent(ui::TouchEvent* event) {
|
|
|