Standardize usage of virtual/override/final specifiers.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc

 // Copyright 2013 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 "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
@@ skipping 27 matching lines @@
     STATE_MINIMIZED,
     STATE_FULLSCREEN
   };
 
   TestLayoutDelegate()
       : show_avatar_(false),
         show_caption_buttons_(true),
         window_state_(STATE_NORMAL) {
   }
 
-  virtual ~TestLayoutDelegate() {}
+  ~TestLayoutDelegate() override {}
 
   void SetWindowTitle(const base::string16& title) {
     window_title_ = title;
   }
 
   void SetShouldShowAvatar(bool show_avatar) {
     show_avatar_ = show_avatar;
   }
 
   void SetShouldShowCaptionButtons(bool show_caption_buttons) {
     show_caption_buttons_ = show_caption_buttons;
   }
 
   void SetWindowState(WindowState state) {
     window_state_ = state;
   }
 
   // OpaqueBrowserFrameViewLayoutDelegate overrides:
 
-  virtual bool ShouldShowWindowIcon() const override {
-    return !window_title_.empty();
-  }
+  bool ShouldShowWindowIcon() const override { return !window_title_.empty(); }
 
-  virtual bool ShouldShowWindowTitle() const override {
-    return !window_title_.empty();
-  }
+  bool ShouldShowWindowTitle() const override { return !window_title_.empty(); }
 
-  virtual base::string16 GetWindowTitle() const override {
-    return window_title_;
-  }
+  base::string16 GetWindowTitle() const override { return window_title_; }
 
-  virtual int GetIconSize() const override {
+  int GetIconSize() const override {
     // The value on linux_aura and non-aura windows.
     return 17;
   }
 
-  virtual bool ShouldLeaveOffsetNearTopBorder() const override {
+  bool ShouldLeaveOffsetNearTopBorder() const override {
     return !IsMaximized();
   }
 
-  virtual gfx::Size GetBrowserViewMinimumSize() const override {
+  gfx::Size GetBrowserViewMinimumSize() const override {
     // Taken from a calculation in BrowserViewLayout.
     return gfx::Size(168, 64);
   }
 
-  virtual bool ShouldShowCaptionButtons() const override {
+  bool ShouldShowCaptionButtons() const override {
     return show_caption_buttons_;
   }
 
-  virtual bool ShouldShowAvatar() const override {
-    return show_avatar_;
-  }
+  bool ShouldShowAvatar() const override { return show_avatar_; }
 
-  virtual bool IsRegularOrGuestSession() const override {
-    return true;
-  }
+  bool IsRegularOrGuestSession() const override { return true; }
 
-  virtual gfx::ImageSkia GetOTRAvatarIcon() const override {
+  gfx::ImageSkia GetOTRAvatarIcon() const override {
     // The calculations depend on the size of the OTR resource, and chromeos
     // uses a different sized image, so hard code the size of the current
     // windows/linux one.
     gfx::ImageSkiaRep rep(gfx::Size(40, 29), 1.0f);
     gfx::ImageSkia image(rep);
     return image;
   }
 
-  virtual bool IsMaximized() const override {
-    return window_state_ == STATE_MAXIMIZED;
-  }
+  bool IsMaximized() const override { return window_state_ == STATE_MAXIMIZED; }
 
-  virtual bool IsMinimized() const override {
-    return window_state_ == STATE_MINIMIZED;
-  }
+  bool IsMinimized() const override { return window_state_ == STATE_MINIMIZED; }
 
-  virtual bool IsFullscreen() const override {
+  bool IsFullscreen() const override {
     return window_state_ == STATE_FULLSCREEN;
   }
 
-  virtual bool IsTabStripVisible() const override {
-    return window_title_.empty();
-  }
+  bool IsTabStripVisible() const override { return window_title_.empty(); }
 
-  virtual int GetTabStripHeight() const override {
+  int GetTabStripHeight() const override {
     return IsTabStripVisible() ? Tab::GetMinimumUnselectedSize().height() : 0;
   }
 
-  virtual gfx::Size GetTabstripPreferredSize() const override {
+  gfx::Size GetTabstripPreferredSize() const override {
     // Measured from Tabstrip::GetPreferredSize().
     return IsTabStripVisible() ? gfx::Size(78, 29) : gfx::Size(0, 0);
   }
 
  private:
   base::string16 window_title_;
   bool show_avatar_;
   bool show_caption_buttons_;
   WindowState window_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLayoutDelegate);
 };
 
 }  // namespace
 
 class OpaqueBrowserFrameViewLayoutTest : public views::ViewsTestBase {
  public:
   OpaqueBrowserFrameViewLayoutTest() {}
-  virtual ~OpaqueBrowserFrameViewLayoutTest() {}
+  ~OpaqueBrowserFrameViewLayoutTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     views::ViewsTestBase::SetUp();
 
     delegate_.reset(new TestLayoutDelegate);
     layout_manager_ = new OpaqueBrowserFrameViewLayout(delegate_.get());
     layout_manager_->set_extra_caption_y(0);
     layout_manager_->set_window_caption_spacing(0);
     widget_ = new Widget;
     widget_->Init(CreateParams(Widget::InitParams::TYPE_POPUP));
     root_view_ = widget_->GetRootView();
     root_view_->SetSize(gfx::Size(kWidth, kWidth));
     root_view_->SetLayoutManager(layout_manager_);
 
     // Add the caption buttons. We use fake images because we're modeling the
     // Windows assets here, while the linux version uses differently sized
     // assets.
     //
     // TODO(erg): In a follow up patch, separate these sizes out into virtual
     // accessors so we can test both the windows and linux behaviours once we
     // start modifying the code.
     minimize_button_ = InitWindowCaptionButton(
         VIEW_ID_MINIMIZE_BUTTON, gfx::Size(26, 18));
     maximize_button_ = InitWindowCaptionButton(
         VIEW_ID_MAXIMIZE_BUTTON, gfx::Size(25, 18));
     restore_button_ = InitWindowCaptionButton(
         VIEW_ID_RESTORE_BUTTON, gfx::Size(25, 18));
     close_button_ = InitWindowCaptionButton(
         VIEW_ID_CLOSE_BUTTON, gfx::Size(43, 18));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     widget_->CloseNow();
 
     views::ViewsTestBase::TearDown();
   }
 
  protected:
   views::ImageButton* InitWindowCaptionButton(ViewID view_id,
                                               const gfx::Size& size) {
     views::ImageButton* button = new views::ImageButton(NULL);
     gfx::ImageSkiaRep rep(size, 1.0f);
@@ skipping 361 matching lines @@
   // both are displayed on the left side.
   // The label height and width depends on the font size and the text displayed.
   // This may possibly change, so we don't test it here.
   EXPECT_EQ(menu_button_->bounds().x() - 2,
             supervised_user_avatar_label_->bounds().x());
   EXPECT_EQ(menu_button_->bounds().bottom() - 3 -
             supervised_user_avatar_label_->bounds().height(),
             supervised_user_avatar_label_->bounds().y());
 }
 #endif