| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| index 0ad8da59c381d333f808e7b2a58444c07fd52808..6e796c8c8c9aaa55cd1f5ff08e040949f8444867 100644
|
| --- a/ash/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -103,14 +103,14 @@ const int ShelfLayoutManager::kShelfItemInset = 3;
|
| class ShelfLayoutManager::AutoHideEventFilter : public ui::EventHandler {
|
| public:
|
| explicit AutoHideEventFilter(ShelfLayoutManager* shelf);
|
| - virtual ~AutoHideEventFilter();
|
| + ~AutoHideEventFilter() override;
|
|
|
| // Returns true if the last mouse event was a mouse drag.
|
| bool in_mouse_drag() const { return in_mouse_drag_; }
|
|
|
| // Overridden from ui::EventHandler:
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) override;
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
| + void OnMouseEvent(ui::MouseEvent* event) override;
|
| + void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| private:
|
| ShelfLayoutManager* shelf_;
|
| @@ -166,14 +166,14 @@ class ShelfLayoutManager::UpdateShelfObserver
|
| shelf_ = NULL;
|
| }
|
|
|
| - virtual void OnImplicitAnimationsCompleted() override {
|
| + void OnImplicitAnimationsCompleted() override {
|
| if (shelf_)
|
| shelf_->UpdateShelfBackground(BACKGROUND_CHANGE_ANIMATE);
|
| delete this;
|
| }
|
|
|
| private:
|
| - virtual ~UpdateShelfObserver() {
|
| + ~UpdateShelfObserver() override {
|
| if (shelf_)
|
| shelf_->update_shelf_observer_ = NULL;
|
| }
|
|
|