| Index: ash/shelf/shelf_tooltip_manager.cc
|
| diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc
|
| index 34d044de9b3218a0d8013219caab20341296d66b..1300b816a24e791c546da2989b439e675f5cad6f 100644
|
| --- a/ash/shelf/shelf_tooltip_manager.cc
|
| +++ b/ash/shelf/shelf_tooltip_manager.cc
|
| @@ -173,20 +173,37 @@ void ShelfTooltipManager::ShowTooltipWithDelay(views::View* view) {
|
| }
|
| }
|
|
|
| -void ShelfTooltipManager::OnMousePressed(const ui::MouseEvent& event,
|
| - const gfx::Point& location_in_screen,
|
| - views::Widget* target) {
|
| +void ShelfTooltipManager::OnMousePressObserved(
|
| + const ui::MouseEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) {
|
| // Close on any mouse press events inside or outside the tooltip.
|
| Close();
|
| }
|
|
|
| -void ShelfTooltipManager::OnTouchPressed(const ui::TouchEvent& event,
|
| - const gfx::Point& location_in_screen,
|
| - views::Widget* target) {
|
| +void ShelfTooltipManager::OnTouchPressObserved(
|
| + const ui::TouchEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) {
|
| // Close on any touch press events inside or outside the tooltip.
|
| Close();
|
| }
|
|
|
| +void ShelfTooltipManager::OnTouchReleaseObserved(
|
| + const ui::TouchEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) {}
|
| +
|
| +void ShelfTooltipManager::OnTouchMoveObserved(
|
| + const ui::TouchEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) {}
|
| +
|
| +void ShelfTooltipManager::OnTouchCancellObserved(
|
| + const ui::TouchEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) {}
|
| +
|
| void ShelfTooltipManager::OnEvent(ui::Event* event) {
|
| // Mouse and touch press events are handled via views::PointerWatcher.
|
| if (event->type() == ui::ET_MOUSE_PRESSED ||
|
|
|