Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1852)

Unified Diff: athena/content/app_activity_proxy.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/content/app_activity_browsertest.cc ('k') | athena/content/app_activity_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « athena/content/app_activity_browsertest.cc ('k') | athena/content/app_activity_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698