| Index: ash/test/test_shelf_item_delegate.h
|
| diff --git a/ash/test/test_shelf_item_delegate.h b/ash/test/test_shelf_item_delegate.h
|
| index 71f25d556e2ffbcda931b81543027b5cf1e9f835..836f5f1b9ef2ae1538f28eb07d4c07e0a3236807 100644
|
| --- a/ash/test/test_shelf_item_delegate.h
|
| +++ b/ash/test/test_shelf_item_delegate.h
|
| @@ -20,16 +20,16 @@ namespace test {
|
| class TestShelfItemDelegate : public ShelfItemDelegate {
|
| public:
|
| explicit TestShelfItemDelegate(aura::Window* window);
|
| - virtual ~TestShelfItemDelegate();
|
| + ~TestShelfItemDelegate() override;
|
|
|
| // ShelfItemDelegate:
|
| - virtual bool ItemSelected(const ui::Event& event) override;
|
| - virtual base::string16 GetTitle() override;
|
| - virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
|
| - virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
|
| - virtual bool IsDraggable() override;
|
| - virtual bool ShouldShowTooltip() override;
|
| - virtual void Close() override;
|
| + bool ItemSelected(const ui::Event& event) override;
|
| + base::string16 GetTitle() override;
|
| + ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
|
| + ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
|
| + bool IsDraggable() override;
|
| + bool ShouldShowTooltip() override;
|
| + void Close() override;
|
|
|
| private:
|
| aura::Window* window_;
|
|
|