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

Unified Diff: athena/content/app_activity.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/activity/activity_widget_delegate.h ('k') | athena/content/app_activity_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/app_activity.h
diff --git a/athena/content/app_activity.h b/athena/content/app_activity.h
index 8ea4e0df30a0b4c393b76b2ff55a92a4eed37aa4..4dfcc45e6d100b53b018f5d04d762d556f634bdf 100644
--- a/athena/content/app_activity.h
+++ b/athena/content/app_activity.h
@@ -31,37 +31,36 @@ class AppActivity : public Activity,
scoped_ptr<ContentProxy> GetContentProxy();
// Activity:
- virtual athena::ActivityViewModel* GetActivityViewModel() override;
- virtual void SetCurrentState(Activity::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(Activity::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::Widget* CreateWidget() override;
- virtual views::View* GetContentsView() 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::Widget* CreateWidget() override;
+ views::View* GetContentsView() override;
+ gfx::ImageSkia GetOverviewModeImage() override;
+ void PrepareContentsForOverview() override;
+ void ResetContentsView() override;
protected:
// Constructor for test.
explicit AppActivity(const std::string& app_id);
- virtual ~AppActivity();
+ ~AppActivity() override;
private:
// content::WebContentsObserver:
- 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;
// Register this activity with its application.
« no previous file with comments | « athena/activity/activity_widget_delegate.h ('k') | athena/content/app_activity_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698