| Index: athena/content/web_activity.h
|
| diff --git a/athena/content/web_activity.h b/athena/content/web_activity.h
|
| index 8dc7b0a29952613a7c3fe2966e5b67352cfd3c33..7a15d12ed10dc47fa206e9bc73c7f23b57c2b758 100644
|
| --- a/athena/content/web_activity.h
|
| +++ b/athena/content/web_activity.h
|
| @@ -46,38 +46,37 @@ class WebActivity : public Activity,
|
| explicit WebActivity(content::WebContents* contents);
|
|
|
| protected:
|
| - virtual ~WebActivity();
|
| + ~WebActivity() override;
|
|
|
| // Activity:
|
| - virtual athena::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;
|
| + athena::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:
|
| - 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;
|
|
|
| // content::WebContentsObserver:
|
| - virtual void DidNavigateMainFrame(
|
| + void DidNavigateMainFrame(
|
| const content::LoadCommittedDetails& details,
|
| const content::FrameNavigateParams& params) override;
|
| - virtual void TitleWasSet(content::NavigationEntry* entry,
|
| - bool explicit_set) override;
|
| - virtual void DidUpdateFaviconURL(
|
| + void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) override;
|
| + void DidUpdateFaviconURL(
|
| const std::vector<content::FaviconURL>& candidates) override;
|
| - virtual void DidChangeThemeColor(SkColor theme_color) override;
|
| + void DidChangeThemeColor(SkColor theme_color) override;
|
|
|
| private:
|
| // Called when a favicon download initiated in DidUpdateFaviconURL()
|
|
|