| Index: ash/shell/window_type_launcher.h
|
| diff --git a/ash/shell/window_type_launcher.h b/ash/shell/window_type_launcher.h
|
| index 8cd389ce025e64c963887849da4ec5ac817cfe50..da6575afcac2ff808302458db8baae67e95abd15 100644
|
| --- a/ash/shell/window_type_launcher.h
|
| +++ b/ash/shell/window_type_launcher.h
|
| @@ -37,27 +37,27 @@ class WindowTypeLauncher : public views::WidgetDelegateView,
|
| };
|
|
|
| // Overridden from views::View:
|
| - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual void OnPaint(gfx::Canvas* canvas) override;
|
| + virtual bool OnMousePressed(const ui::MouseEvent& event) override;
|
|
|
| // Overridden from views::WidgetDelegate:
|
| - virtual views::View* GetContentsView() OVERRIDE;
|
| - virtual bool CanResize() const OVERRIDE;
|
| - virtual base::string16 GetWindowTitle() const OVERRIDE;
|
| - virtual bool CanMaximize() const OVERRIDE;
|
| - virtual bool CanMinimize() const OVERRIDE;
|
| + virtual views::View* GetContentsView() override;
|
| + virtual bool CanResize() const override;
|
| + virtual base::string16 GetWindowTitle() const override;
|
| + virtual bool CanMaximize() const override;
|
| + virtual bool CanMinimize() const override;
|
|
|
| // Overridden from views::ButtonListener:
|
| virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) OVERRIDE;
|
| + const ui::Event& event) override;
|
|
|
| // Overridden from views::MenuDelegate:
|
| - virtual void ExecuteCommand(int id, int event_flags) OVERRIDE;
|
| + virtual void ExecuteCommand(int id, int event_flags) override;
|
|
|
| // Override from views::ContextMenuController:
|
| virtual void ShowContextMenuForView(views::View* source,
|
| const gfx::Point& point,
|
| - ui::MenuSourceType source_type) OVERRIDE;
|
| + ui::MenuSourceType source_type) override;
|
|
|
| views::LabelButton* create_button_;
|
| views::LabelButton* create_persistant_button_;
|
|
|