| Index: athena/content/app_activity_proxy.h
|
| diff --git a/athena/content/app_activity_proxy.h b/athena/content/app_activity_proxy.h
|
| index 6df8123e7a5a35fb64065afe05621b464f0ebd40..a8193cc9c100718edd5082014e49436dd499d16f 100644
|
| --- a/athena/content/app_activity_proxy.h
|
| +++ b/athena/content/app_activity_proxy.h
|
| @@ -30,28 +30,28 @@ class AppActivityProxy : public Activity,
|
| AppActivityRegistry* creator);
|
|
|
| protected:
|
| - virtual ~AppActivityProxy();
|
| + ~AppActivityProxy() override;
|
|
|
| // Activity overrides:
|
| - virtual ActivityViewModel* GetActivityViewModel() override;
|
| - virtual void SetCurrentState(ActivityState state) override;
|
| - virtual ActivityState GetCurrentState() override;
|
| - virtual bool IsVisible() override;
|
| - virtual ActivityMediaState GetMediaState() override;
|
| - virtual aura::Window* GetWindow() override;
|
| - virtual content::WebContents* GetWebContents() override;
|
| + ActivityViewModel* GetActivityViewModel() override;
|
| + void SetCurrentState(ActivityState state) override;
|
| + ActivityState GetCurrentState() override;
|
| + bool IsVisible() override;
|
| + ActivityMediaState GetMediaState() override;
|
| + aura::Window* GetWindow() override;
|
| + content::WebContents* GetWebContents() override;
|
|
|
| // ActivityViewModel overrides:
|
| - virtual void Init() override;
|
| - virtual SkColor GetRepresentativeColor() const override;
|
| - virtual base::string16 GetTitle() const override;
|
| - virtual gfx::ImageSkia GetIcon() const override;
|
| - virtual bool UsesFrame() const override;
|
| - virtual views::View* GetContentsView() override;
|
| - virtual views::Widget* CreateWidget() override;
|
| - virtual gfx::ImageSkia GetOverviewModeImage() override;
|
| - virtual void PrepareContentsForOverview() override;
|
| - virtual void ResetContentsView() override;
|
| + void Init() override;
|
| + SkColor GetRepresentativeColor() const override;
|
| + base::string16 GetTitle() const override;
|
| + gfx::ImageSkia GetIcon() const override;
|
| + bool UsesFrame() const override;
|
| + views::View* GetContentsView() override;
|
| + views::Widget* CreateWidget() override;
|
| + gfx::ImageSkia GetOverviewModeImage() override;
|
| + void PrepareContentsForOverview() override;
|
| + void ResetContentsView() override;
|
|
|
| private:
|
| // The creator of this object which needs to be informed if the object gets
|
|
|