| Index: ash/shelf/shelf_tooltip_manager.h
|
| diff --git a/ash/shelf/shelf_tooltip_manager.h b/ash/shelf/shelf_tooltip_manager.h
|
| index d7ca088610ceb6d0b6ea49df4bc430db84f0ed72..96c72592994c159f8363053262cc0e1d0f64f523 100644
|
| --- a/ash/shelf/shelf_tooltip_manager.h
|
| +++ b/ash/shelf/shelf_tooltip_manager.h
|
| @@ -78,16 +78,16 @@ class ASH_EXPORT ShelfTooltipManager : public ui::EventHandler,
|
|
|
| protected:
|
| // ui::EventHandler overrides:
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
|
| - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| - virtual void OnCancelMode(ui::CancelModeEvent* event) OVERRIDE;
|
| + virtual void OnMouseEvent(ui::MouseEvent* event) override;
|
| + virtual void OnTouchEvent(ui::TouchEvent* event) override;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
| + virtual void OnCancelMode(ui::CancelModeEvent* event) override;
|
|
|
| // ShelfLayoutManagerObserver overrides:
|
| - virtual void WillDeleteShelf() OVERRIDE;
|
| + virtual void WillDeleteShelf() override;
|
| virtual void WillChangeVisibilityState(
|
| - ShelfVisibilityState new_state) OVERRIDE;
|
| - virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) OVERRIDE;
|
| + ShelfVisibilityState new_state) override;
|
| + virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
|
|
|
| private:
|
| class ShelfTooltipBubble;
|
|
|