| Index: ui/views/corewm/tooltip_controller.h
|
| diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h
|
| index 8242725de88e0dbcf50921da9a1ca163c014d34a..e3be802b942e5b9a1e931f974fec2c5ca931100a 100644
|
| --- a/ui/views/corewm/tooltip_controller.h
|
| +++ b/ui/views/corewm/tooltip_controller.h
|
| @@ -35,22 +35,21 @@ class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient,
|
| public aura::WindowObserver {
|
| public:
|
| explicit TooltipController(scoped_ptr<Tooltip> tooltip);
|
| - virtual ~TooltipController();
|
| + ~TooltipController() override;
|
|
|
| // Overridden from aura::client::TooltipClient.
|
| - virtual void UpdateTooltip(aura::Window* target) override;
|
| - virtual void SetTooltipShownTimeout(aura::Window* target,
|
| - int timeout_in_ms) override;
|
| - virtual void SetTooltipsEnabled(bool enable) override;
|
| + void UpdateTooltip(aura::Window* target) override;
|
| + void SetTooltipShownTimeout(aura::Window* target, int timeout_in_ms) override;
|
| + void SetTooltipsEnabled(bool enable) override;
|
|
|
| // Overridden from ui::EventHandler.
|
| - virtual void OnKeyEvent(ui::KeyEvent* event) override;
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) override;
|
| - virtual void OnTouchEvent(ui::TouchEvent* event) override;
|
| - virtual void OnCancelMode(ui::CancelModeEvent* event) override;
|
| + void OnKeyEvent(ui::KeyEvent* event) override;
|
| + void OnMouseEvent(ui::MouseEvent* event) override;
|
| + void OnTouchEvent(ui::TouchEvent* event) override;
|
| + void OnCancelMode(ui::CancelModeEvent* event) override;
|
|
|
| // Overridden from aura::WindowObserver.
|
| - virtual void OnWindowDestroyed(aura::Window* window) override;
|
| + void OnWindowDestroyed(aura::Window* window) override;
|
|
|
| const gfx::Point& mouse_location() const { return curr_mouse_loc_; }
|
|
|
|
|