C++11 override style change for athena

athena/content/web_activity.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ATHENA_CONTENT_PUBLIC_WEB_ACTIVITY_H_
 #define ATHENA_CONTENT_PUBLIC_WEB_ACTIVITY_H_
 
 #include <vector>
 
 #include "athena/activity/public/activity.h"
@@ skipping 28 matching lines @@
 class WebActivity : public Activity,
                     public ActivityViewModel,
                     public content::WebContentsObserver {
  public:
   WebActivity(content::BrowserContext* context,
               const base::string16& title,
               const GURL& gurl);
   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()
   // has completed.
   void OnDidDownloadFavicon(
       int id,
       int http_status_code,
       const GURL& url,
       const std::vector<SkBitmap>& bitmaps,
       const std::vector<gfx::Size>& original_bitmap_sizes);
@@ skipping 17 matching lines @@
   scoped_ptr<ContentProxy> content_proxy_;
 
   base::WeakPtrFactory<WebActivity> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebActivity);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_CONTENT_WEB_ACTIVITY_H_