| Index: ash/shell/window_type_launcher.h
|
| diff --git a/ash/shell/window_type_launcher.h b/ash/shell/window_type_launcher.h
|
| index da6575afcac2ff808302458db8baae67e95abd15..d0560f04fe5a26b8f38296275a937c9ad165090a 100644
|
| --- a/ash/shell/window_type_launcher.h
|
| +++ b/ash/shell/window_type_launcher.h
|
| @@ -26,7 +26,7 @@ class WindowTypeLauncher : public views::WidgetDelegateView,
|
| public views::ContextMenuController {
|
| public:
|
| WindowTypeLauncher();
|
| - virtual ~WindowTypeLauncher();
|
| + ~WindowTypeLauncher() override;
|
|
|
| private:
|
| typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
|
| @@ -37,27 +37,26 @@ class WindowTypeLauncher : public views::WidgetDelegateView,
|
| };
|
|
|
| // Overridden from views::View:
|
| - virtual void OnPaint(gfx::Canvas* canvas) override;
|
| - virtual bool OnMousePressed(const ui::MouseEvent& event) override;
|
| + void OnPaint(gfx::Canvas* canvas) override;
|
| + 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;
|
| + views::View* GetContentsView() override;
|
| + bool CanResize() const override;
|
| + base::string16 GetWindowTitle() const override;
|
| + bool CanMaximize() const override;
|
| + bool CanMinimize() const override;
|
|
|
| // Overridden from views::ButtonListener:
|
| - virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) override;
|
| + void ButtonPressed(views::Button* sender, const ui::Event& event) override;
|
|
|
| // Overridden from views::MenuDelegate:
|
| - virtual void ExecuteCommand(int id, int event_flags) override;
|
| + 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;
|
| + void ShowContextMenuForView(views::View* source,
|
| + const gfx::Point& point,
|
| + ui::MenuSourceType source_type) override;
|
|
|
| views::LabelButton* create_button_;
|
| views::LabelButton* create_persistant_button_;
|
|
|