| 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 9de8f6fbf0bb26b1db65287c051edf606e0b4127..b39a70b23db8b6b17f086b0a6e751458e34d19e7 100644
|
| --- a/ash/shelf/shelf_window_watcher_item_delegate.h
|
| +++ b/ash/shelf/shelf_window_watcher_item_delegate.h
|
| @@ -25,13 +25,13 @@ class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
|
|
|
| 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;
|
| + 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;
|
|
|
| // Stores a Window associated with this item. Not owned.
|
| aura::Window* window_;
|
|
|