Standardize usage of virtual/override/final in ui/

ui/base/cocoa/menu_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 21 matching lines @@
 class Delegate : public SimpleMenuModel::Delegate {
  public:
   Delegate()
       : execute_count_(0),
         enable_count_(0),
         menu_to_close_(nil),
         did_show_(false),
         did_close_(false) {
   }
 
-  virtual bool IsCommandIdChecked(int command_id) const override {
-    return false;
-  }
-  virtual bool IsCommandIdEnabled(int command_id) const override {
+  bool IsCommandIdChecked(int command_id) const override { return false; }
+  bool IsCommandIdEnabled(int command_id) const override {
     ++enable_count_;
     return true;
   }
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      Accelerator* accelerator) override { return false; }
-  virtual void ExecuteCommand(int command_id, int event_flags) override {
+  bool GetAcceleratorForCommandId(int command_id,
+                                  Accelerator* accelerator) override {
+    return false;
+  }
+  void ExecuteCommand(int command_id, int event_flags) override {
     ++execute_count_;
   }
 
-  virtual void MenuWillShow(SimpleMenuModel* /*source*/) override {
+  void MenuWillShow(SimpleMenuModel* /*source*/) override {
     EXPECT_FALSE(did_show_);
     EXPECT_FALSE(did_close_);
     did_show_ = true;
     NSArray* modes = [NSArray arrayWithObjects:NSEventTrackingRunLoopMode,
                                                NSDefaultRunLoopMode,
                                                nil];
     [menu_to_close_ performSelector:@selector(cancelTracking)
                          withObject:nil
                          afterDelay:0.1
                             inModes:modes];
   }
 
-  virtual void MenuClosed(SimpleMenuModel* /*source*/) override {
+  void MenuClosed(SimpleMenuModel* /*source*/) override {
     EXPECT_TRUE(did_show_);
     EXPECT_FALSE(did_close_);
     did_close_ = true;
   }
 
   int execute_count_;
   mutable int enable_count_;
   // The menu on which to call |-cancelTracking| after a short delay in
   // MenuWillShow.
   NSMenu* menu_to_close_;
   bool did_show_;
   bool did_close_;
 };
 
 // Just like Delegate, except the items are treated as "dynamic" so updates to
 // the label/icon in the model are reflected in the menu.
 class DynamicDelegate : public Delegate {
  public:
   DynamicDelegate() {}
-  virtual bool IsItemForCommandIdDynamic(int command_id) const override {
-    return true;
-  }
-  virtual base::string16 GetLabelForCommandId(int command_id) const override {
+  bool IsItemForCommandIdDynamic(int command_id) const override { return true; }
+  base::string16 GetLabelForCommandId(int command_id) const override {
     return label_;
   }
-  virtual bool GetIconForCommandId(
-      int command_id,
-      gfx::Image* icon) const override {
+  bool GetIconForCommandId(int command_id, gfx::Image* icon) const override {
     if (icon_.IsEmpty()) {
       return false;
     } else {
       *icon = icon_;
       return true;
     }
   }
   void SetDynamicLabel(base::string16 label) { label_ = label; }
   void SetDynamicIcon(const gfx::Image& icon) { icon_ = icon; }
 
  private:
   base::string16 label_;
   gfx::Image icon_;
 };
 
 // Menu model that returns a gfx::FontList object for one of the items in the
 // menu.
 class FontListMenuModel : public SimpleMenuModel {
  public:
   FontListMenuModel(SimpleMenuModel::Delegate* delegate,
                     const gfx::FontList* font_list, int index)
       : SimpleMenuModel(delegate),
         font_list_(font_list),
         index_(index) {
   }
-  virtual ~FontListMenuModel() {}
-  virtual const gfx::FontList* GetLabelFontListAt(int index) const override {
+  ~FontListMenuModel() override {}
+  const gfx::FontList* GetLabelFontListAt(int index) const override {
     return (index == index_) ? font_list_ : NULL;
   }
 
  private:
   const gfx::FontList* font_list_;
   const int index_;
 };
 
 TEST_F(MenuControllerTest, EmptyMenu) {
   Delegate delegate;
@@ skipping 259 matching lines @@
   // Pump the task that notifies the delegate.
   message_loop.RunUntilIdle();
 
   // Expect that the delegate got notified properly.
   EXPECT_TRUE(delegate.did_close_);
 }
 
 }  // namespace
 
 }  // namespace ui