Standardize usage of virtual/override/final specifiers.

ash/frame/custom_frame_view_ash.cc

 // Copyright (c) 2012 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.
 
 #include "ash/frame/custom_frame_view_ash.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 48 matching lines @@
 
     // Add a window state observer to exit fullscreen properly in case
     // fullscreen is exited without going through
     // WindowState::ToggleFullscreen(). This is the case when exiting
     // immersive fullscreen via the "Restore" window control.
     // TODO(pkotwicz): This is a hack. Remove ASAP. http://crbug.com/319048
     window_state_ = window_state;
     window_state_->AddObserver(this);
     window_state_->window()->AddObserver(this);
   }
-  virtual ~CustomFrameViewAshWindowStateDelegate() {
+  ~CustomFrameViewAshWindowStateDelegate() override {
     if (window_state_) {
       window_state_->RemoveObserver(this);
       window_state_->window()->RemoveObserver(this);
     }
   }
  private:
   // Overridden from ash::wm::WindowStateDelegate:
-  virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) override {
+  bool ToggleFullscreen(ash::wm::WindowState* window_state) override {
     bool enter_fullscreen = !window_state->IsFullscreen();
     if (enter_fullscreen) {
       window_state->window()->SetProperty(aura::client::kShowStateKey,
                                            ui::SHOW_STATE_FULLSCREEN);
     } else {
       window_state->Restore();
     }
     if (immersive_fullscreen_controller_) {
       immersive_fullscreen_controller_->SetEnabled(
           ash::ImmersiveFullscreenController::WINDOW_TYPE_OTHER,
           enter_fullscreen);
     }
     return true;
   }
   // Overridden from aura::WindowObserver:
-  virtual void OnWindowDestroying(aura::Window* window) override {
+  void OnWindowDestroying(aura::Window* window) override {
     window_state_->RemoveObserver(this);
     window_state_->window()->RemoveObserver(this);
     window_state_ = NULL;
   }
   // Overridden from ash::wm::WindowStateObserver:
-  virtual void OnPostWindowStateTypeChange(
-      ash::wm::WindowState* window_state,
-      ash::wm::WindowStateType old_type) override {
+  void OnPostWindowStateTypeChange(ash::wm::WindowState* window_state,
+                                   ash::wm::WindowStateType old_type) override {
     if (!window_state->IsFullscreen() &&
         !window_state->IsMinimized() &&
         immersive_fullscreen_controller_.get() &&
         immersive_fullscreen_controller_->IsEnabled()) {
       immersive_fullscreen_controller_->SetEnabled(
           ash::ImmersiveFullscreenController::WINDOW_TYPE_OTHER,
           false);
     }
   }
 
@@ skipping 13 matching lines @@
 
 // View which paints the header. It slides off and on screen in immersive
 // fullscreen.
 class CustomFrameViewAsh::HeaderView
     : public views::View,
       public ImmersiveFullscreenController::Delegate,
       public ShellObserver {
  public:
   // |frame| is the widget that the caption buttons act on.
   explicit HeaderView(views::Widget* frame);
-  virtual ~HeaderView();
+  ~HeaderView() override;
 
   // Schedules a repaint for the entire title.
   void SchedulePaintForTitle();
 
   // Tells the window controls to reset themselves to the normal state.
   void ResetWindowControls();
 
   // Returns the amount of the view's pixels which should be on screen.
   int GetPreferredOnScreenHeight() const;
 
   // Returns the view's preferred height.
   int GetPreferredHeight() const;
 
   // Returns the view's minimum width.
   int GetMinimumWidth() const;
 
   void UpdateAvatarIcon();
 
   void SizeConstraintsChanged();
 
   void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
 
   // views::View:
-  virtual void Layout() override;
-  virtual void OnPaint(gfx::Canvas* canvas) override;
-  virtual void ChildPreferredSizeChanged(views::View* child) override;
+  void Layout() override;
+  void OnPaint(gfx::Canvas* canvas) override;
+  void ChildPreferredSizeChanged(views::View* child) override;
 
   // ShellObserver:
-  virtual void OnMaximizeModeStarted() override;
-  virtual void OnMaximizeModeEnded() override;
+  void OnMaximizeModeStarted() override;
+  void OnMaximizeModeEnded() override;
 
   FrameCaptionButtonContainerView* caption_button_container() {
     return caption_button_container_;
   }
 
   views::View* avatar_icon() const {
     return avatar_icon_;
   }
 
  private:
   // ImmersiveFullscreenController::Delegate:
-  virtual void OnImmersiveRevealStarted() override;
-  virtual void OnImmersiveRevealEnded() override;
-  virtual void OnImmersiveFullscreenExited() override;
-  virtual void SetVisibleFraction(double visible_fraction) override;
-  virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override;
+  void OnImmersiveRevealStarted() override;
+  void OnImmersiveRevealEnded() override;
+  void OnImmersiveFullscreenExited() override;
+  void SetVisibleFraction(double visible_fraction) override;
+  std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override;
 
   // The widget that the caption buttons act on.
   views::Widget* frame_;
 
   // Helper for painting the header.
   scoped_ptr<DefaultHeaderPainter> header_painter_;
 
   views::ImageView* avatar_icon_;
 
   // View which contains the window caption buttons.
@@ skipping 173 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::OverlayView
 
 // View which takes up the entire widget and contains the HeaderView. HeaderView
 // is a child of OverlayView to avoid creating a larger texture than necessary
 // when painting the HeaderView to its own layer.
 class CustomFrameViewAsh::OverlayView : public views::View,
                                         public views::ViewTargeterDelegate {
  public:
   explicit OverlayView(HeaderView* header_view);
-  virtual ~OverlayView();
+  ~OverlayView() override;
 
   // views::View:
-  virtual void Layout() override;
+  void Layout() override;
 
  private:
   // views::ViewTargeterDelegate:
-  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;
 
   HeaderView* header_view_;
 
   DISALLOW_COPY_AND_ASSIGN(OverlayView);
 };
 
 CustomFrameViewAsh::OverlayView::OverlayView(HeaderView* header_view)
     : header_view_(header_view) {
   AddChildView(header_view);
   SetEventTargeter(
@@ skipping 191 matching lines @@
 FrameCaptionButtonContainerView* CustomFrameViewAsh::
     GetFrameCaptionButtonContainerViewForTest() {
   return header_view_->caption_button_container();
 }
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash