Update {virtual,override} to follow C++11 style in chrome.

The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override.

This patch was manually generated using a regex and a text editor.

BUG=417463

Review URL: https://codereview.chromium.org/1100223002

Cr-Commit-Position: refs/heads/master@{#326870}

6 files changed, 49 insertions, 52 deletions

diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc
index a280299..ea2d19d 100644
--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc
+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc
@@ -41,27 +41,27 @@ class DesktopThemeProvider : public ui::ThemeProvider {
       : delegate_(delegate) {
   }
 
-  virtual bool UsingSystemTheme() const override {
+  bool UsingSystemTheme() const override {
     return delegate_->UsingSystemTheme();
   }
-  virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
+  gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
     return delegate_->GetImageSkiaNamed(
         chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
   }
-  virtual SkColor GetColor(int id) const override {
+  SkColor GetColor(int id) const override {
     return delegate_->GetColor(id);
   }
-  virtual int GetDisplayProperty(int id) const override {
+  int GetDisplayProperty(int id) const override {
     return delegate_->GetDisplayProperty(id);
   }
-  virtual bool ShouldUseNativeFrame() const override {
+  bool ShouldUseNativeFrame() const override {
     return delegate_->ShouldUseNativeFrame();
   }
-  virtual bool HasCustomImage(int id) const override {
+  bool HasCustomImage(int id) const override {
     return delegate_->HasCustomImage(
         chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
   }
-  virtual base::RefCountedMemory* GetRawData(
+  base::RefCountedMemory* GetRawData(
       int id,
       ui::ScaleFactor scale_factor) const override {
     return delegate_->GetRawData(id, scale_factor);
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
index bfb355b..26f20c2 100644
--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
@@ -29,31 +29,29 @@ class BrowserDesktopWindowTreeHostWin : public BrowserDesktopWindowTreeHost,
       views::DesktopNativeWidgetAura* desktop_native_widget_aura,
       BrowserView* browser_view,
       BrowserFrame* browser_frame);
-  virtual ~BrowserDesktopWindowTreeHostWin();
+  ~BrowserDesktopWindowTreeHostWin() override;
 
  private:
   views::NativeMenuWin* GetSystemMenu();
 
   // Overridden from BrowserDesktopWindowTreeHost:
-  virtual DesktopWindowTreeHost* AsDesktopWindowTreeHost() override;
-  virtual int GetMinimizeButtonOffset() const override;
-  virtual bool UsesNativeSystemMenu() const override;
+  DesktopWindowTreeHost* AsDesktopWindowTreeHost() override;
+  int GetMinimizeButtonOffset() const override;
+  bool UsesNativeSystemMenu() const override;
 
   // Overridden from DesktopWindowTreeHostWin:
-  virtual int GetInitialShowState() const override;
-  virtual bool GetClientAreaInsets(gfx::Insets* insets) const override;
-  virtual void HandleCreate() override;
-  virtual void HandleFrameChanged() override;
-  virtual bool PreHandleMSG(UINT message,
-                            WPARAM w_param,
-                            LPARAM l_param,
-                            LRESULT* result) override;
-  virtual void PostHandleMSG(UINT message,
-                             WPARAM w_param,
-                             LPARAM l_param) override;
-  virtual bool IsUsingCustomFrame() const override;
-  virtual bool ShouldUseNativeFrame() const override;
-  virtual void FrameTypeChanged() override;
+  int GetInitialShowState() const override;
+  bool GetClientAreaInsets(gfx::Insets* insets) const override;
+  void HandleCreate() override;
+  void HandleFrameChanged() override;
+  bool PreHandleMSG(UINT message,
+                    WPARAM w_param,
+                    LPARAM l_param,
+                    LRESULT* result) override;
+  void PostHandleMSG(UINT message, WPARAM w_param, LPARAM l_param) override;
+  bool IsUsingCustomFrame() const override;
+  bool ShouldUseNativeFrame() const override;
+  void FrameTypeChanged() override;
 
   void UpdateDWMFrame();
 
diff --git a/chrome/browser/ui/views/frame/browser_frame_ashwin.h b/chrome/browser/ui/views/frame/browser_frame_ashwin.h
index 8bad8ee..2352689 100644
--- a/chrome/browser/ui/views/frame/browser_frame_ashwin.h
+++ b/chrome/browser/ui/views/frame/browser_frame_ashwin.h
@@ -14,11 +14,12 @@ class BrowserFrameAshWin : public BrowserFrameAsh {
   BrowserFrameAshWin(BrowserFrame* browser_frame, BrowserView* browser_view);
 
  protected:
-  virtual ~BrowserFrameAshWin();
+  ~BrowserFrameAshWin() override;
 
   // Overridden from aura::client::ActivationChangeObserver:
-  virtual void OnWindowFocused(aura::Window* gained_focus,
-                               aura::Window* lost_focus) override;
+  void OnWindowFocused(aura::Window* gained_focus,
+                       aura::Window* lost_focus) override;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserFrameAshWin);
 };
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
index ae7560a..ef19840 100644
--- a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
+++ b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
@@ -169,7 +169,7 @@ class BrowserTestWithProfileShortcutManager : public InProcessBrowserTest {
  public:
   BrowserTestWithProfileShortcutManager() {}
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kEnableProfileShortcutManager);
   }
 
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.h b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
index 7d29eb9..292d56e 100644
--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
@@ -17,43 +17,41 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
  public:
   // Constructs a non-client view for an BrowserFrame.
   GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
-  virtual ~GlassBrowserFrameView();
+  ~GlassBrowserFrameView() override;
 
   // BrowserNonClientFrameView:
-  virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override;
-  virtual int GetTopInset() const override;
-  virtual int GetThemeBackgroundXInset() const override;
-  virtual void UpdateThrobber(bool running) override;
-  virtual gfx::Size GetMinimumSize() const override;
+  gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override;
+  int GetTopInset() const override;
+  int GetThemeBackgroundXInset() const override;
+  void UpdateThrobber(bool running) override;
+  gfx::Size GetMinimumSize() const override;
 
   // views::NonClientFrameView:
-  virtual gfx::Rect GetBoundsForClientView() const override;
-  virtual gfx::Rect GetWindowBoundsForClientBounds(
+  gfx::Rect GetBoundsForClientView() const override;
+  gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
-  virtual int NonClientHitTest(const gfx::Point& point) override;
-  virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
-      override {}
-  virtual void ResetWindowControls() override {}
-  virtual void UpdateWindowIcon() override {}
-  virtual void UpdateWindowTitle() override {}
-  virtual void SizeConstraintsChanged() override {}
+  int NonClientHitTest(const gfx::Point& point) override;
+  void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override {}
+  void ResetWindowControls() override {}
+  void UpdateWindowIcon() override {}
+  void UpdateWindowTitle() override {}
+  void SizeConstraintsChanged() override {}
 
  protected:
   // views::View:
-  virtual void OnPaint(gfx::Canvas* canvas) override;
-  virtual void Layout() override;
+  void OnPaint(gfx::Canvas* canvas) override;
+  void Layout() override;
 
   // views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) override;
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // BrowserNonClientFrameView:
   void UpdateNewAvatarButtonImpl() override;
 
  private:
   // views::NonClientFrameView:
-  virtual bool DoesIntersectRect(const views::View* target,
-                                 const gfx::Rect& rect) const override;
+  bool DoesIntersectRect(const views::View* target,
+                         const gfx::Rect& rect) const override;
 
   // Returns the thickness of the border that makes up the window frame edges.
   // This does not include any client edge.
diff --git a/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h b/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h
index 86f03a2..b1bc124 100644
--- a/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h
+++ b/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h
@@ -15,10 +15,10 @@
 class SystemMenuInsertionDelegateWin : public views::MenuInsertionDelegateWin {
  public:
   SystemMenuInsertionDelegateWin() {}
-  virtual ~SystemMenuInsertionDelegateWin() {}
+  ~SystemMenuInsertionDelegateWin() override {}
 
   // Overridden from views::MenuInsertionDelegateWin:
-  virtual int GetInsertionIndex(HMENU native_menu) override;
+  int GetInsertionIndex(HMENU native_menu) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SystemMenuInsertionDelegateWin);