| Index: ash/tooltips/tooltip_controller.cc
|
| diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
|
| index 21dcab57f82e64613c36b9dfa59bf1ae66d53130..ef80f9bfb932211ab44c2d4a87fece2533188b14 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) {
|
|
|