| Index: ash/shell/window_watcher_shelf_item_delegate.h
|
| diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h
|
| index 44542f6b156e83cf2ab2b60717ee747d33dc4d56..1da99d70549cd440a811be36bd19a9096e93aa84 100644
|
| --- a/ash/shell/window_watcher_shelf_item_delegate.h
|
| +++ b/ash/shell/window_watcher_shelf_item_delegate.h
|
| @@ -22,13 +22,13 @@ class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
|
| virtual ~WindowWatcherShelfItemDelegate();
|
|
|
| // 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;
|
| + 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;
|
|
|
| private:
|
| ShelfID id_;
|
|
|