| Index: ash/shelf/app_list_button.h
|
| diff --git a/ash/shelf/app_list_button.h b/ash/shelf/app_list_button.h
|
| index 97dafb6919b8d93028b69414c82454e2f7f90be1..b5ad007704648b101aebbf09e55cd288088b6de8 100644
|
| --- a/ash/shelf/app_list_button.h
|
| +++ b/ash/shelf/app_list_button.h
|
| @@ -20,7 +20,7 @@ class AppListButton : public views::ImageButton {
|
| AppListButton(views::ButtonListener* listener,
|
| ShelfButtonHost* host,
|
| ShelfWidget* shelf_widget);
|
| - virtual ~AppListButton();
|
| + ~AppListButton() override;
|
|
|
| bool draw_background_as_active() {
|
| return draw_background_as_active_;
|
| @@ -28,18 +28,18 @@ class AppListButton : public views::ImageButton {
|
|
|
| protected:
|
| // views::ImageButton overrides:
|
| - virtual bool OnMousePressed(const ui::MouseEvent& event) override;
|
| - virtual void OnMouseReleased(const ui::MouseEvent& event) override;
|
| - virtual void OnMouseCaptureLost() override;
|
| - virtual bool OnMouseDragged(const ui::MouseEvent& event) override;
|
| - virtual void OnMouseMoved(const ui::MouseEvent& event) override;
|
| - virtual void OnMouseEntered(const ui::MouseEvent& event) override;
|
| - virtual void OnMouseExited(const ui::MouseEvent& event) override;
|
| - virtual void OnPaint(gfx::Canvas* canvas) override;
|
| - virtual void GetAccessibleState(ui::AXViewState* state) override;
|
| + bool OnMousePressed(const ui::MouseEvent& event) override;
|
| + void OnMouseReleased(const ui::MouseEvent& event) override;
|
| + void OnMouseCaptureLost() override;
|
| + bool OnMouseDragged(const ui::MouseEvent& event) override;
|
| + void OnMouseMoved(const ui::MouseEvent& event) override;
|
| + void OnMouseEntered(const ui::MouseEvent& event) override;
|
| + void OnMouseExited(const ui::MouseEvent& event) override;
|
| + void OnPaint(gfx::Canvas* canvas) override;
|
| + void GetAccessibleState(ui::AXViewState* state) override;
|
|
|
| // ui::EventHandler overrides:
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
| + void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| private:
|
| // Toggles the active state for painting the background and schedules a paint.
|
|
|