| Index: ash/test/test_shelf_delegate.h
|
| diff --git a/ash/test/test_shelf_delegate.h b/ash/test/test_shelf_delegate.h
|
| index 738c2271fde00baea56cd578faf6589d69ab6a3d..dcafc7e1a28052e1e5da437ad529fdbd030f14c4 100644
|
| --- a/ash/test/test_shelf_delegate.h
|
| +++ b/ash/test/test_shelf_delegate.h
|
| @@ -23,7 +23,7 @@ namespace test {
|
| class TestShelfDelegate : public ShelfDelegate, public aura::WindowObserver {
|
| public:
|
| explicit TestShelfDelegate(ShelfModel* model);
|
| - virtual ~TestShelfDelegate();
|
| + ~TestShelfDelegate() override;
|
|
|
| void AddShelfItem(aura::Window* window);
|
| void AddShelfItem(aura::Window* window, ShelfItemStatus status);
|
| @@ -32,19 +32,18 @@ class TestShelfDelegate : public ShelfDelegate, public aura::WindowObserver {
|
| static TestShelfDelegate* instance() { return instance_; }
|
|
|
| // WindowObserver implementation
|
| - virtual void OnWindowDestroying(aura::Window* window) override;
|
| - virtual void OnWindowHierarchyChanging(
|
| - const HierarchyChangeParams& params) override;
|
| + void OnWindowDestroying(aura::Window* window) override;
|
| + void OnWindowHierarchyChanging(const HierarchyChangeParams& params) override;
|
|
|
| // ShelfDelegate implementation.
|
| - virtual void OnShelfCreated(Shelf* shelf) override;
|
| - virtual void OnShelfDestroyed(Shelf* shelf) override;
|
| - virtual ShelfID GetShelfIDForAppID(const std::string& app_id) override;
|
| - virtual const std::string& GetAppIDForShelfID(ShelfID id) override;
|
| - virtual void PinAppWithID(const std::string& app_id) override;
|
| - virtual bool CanPin() const override;
|
| - virtual bool IsAppPinned(const std::string& app_id) override;
|
| - virtual void UnpinAppWithID(const std::string& app_id) override;
|
| + void OnShelfCreated(Shelf* shelf) override;
|
| + void OnShelfDestroyed(Shelf* shelf) override;
|
| + ShelfID GetShelfIDForAppID(const std::string& app_id) override;
|
| + const std::string& GetAppIDForShelfID(ShelfID id) override;
|
| + void PinAppWithID(const std::string& app_id) override;
|
| + bool CanPin() const override;
|
| + bool IsAppPinned(const std::string& app_id) override;
|
| + void UnpinAppWithID(const std::string& app_id) override;
|
|
|
| private:
|
| static TestShelfDelegate* instance_;
|
|
|