| Index: ash/shelf/shelf_window_watcher_item_delegate.h
|
| diff --git a/ash/shelf/shelf_window_watcher_item_delegate.h b/ash/shelf/shelf_window_watcher_item_delegate.h
|
| index b39a70b23db8b6b17f086b0a6e751458e34d19e7..d2733d3eff45a417f43c30f5351f858301c3fe89 100644
|
| --- a/ash/shelf/shelf_window_watcher_item_delegate.h
|
| +++ b/ash/shelf/shelf_window_watcher_item_delegate.h
|
| @@ -21,17 +21,17 @@ class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
|
| public:
|
| ShelfWindowWatcherItemDelegate(aura::Window* window, ShelfModel* model_);
|
|
|
| - virtual ~ShelfWindowWatcherItemDelegate();
|
| + ~ShelfWindowWatcherItemDelegate() override;
|
|
|
| private:
|
| // ShelfItemDelegate overrides:
|
| - 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;
|
|
|
| // Stores a Window associated with this item. Not owned.
|
| aura::Window* window_;
|
|
|