Standardize usage of virtual/override/final specifiers.

ui/views/controls/menu/menu_model_adapter_unittest.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 "ui/views/controls/menu/menu_model_adapter.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/models/menu_model_delegate.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/test/views_test_base.h"
 
 namespace {
 
 // Base command id for test menu and its submenu.
 const int kRootIdBase = 100;
 const int kSubmenuIdBase = 200;
 
 class MenuModelBase : public ui::MenuModel {
  public:
   explicit MenuModelBase(int command_id_base)
       : command_id_base_(command_id_base),
         last_activation_(-1) {
   }
 
-  virtual ~MenuModelBase() {
-  }
+  ~MenuModelBase() override {}
 
   // ui::MenuModel implementation:
 
-  virtual bool HasIcons() const override {
+  bool HasIcons() const override { return false; }
+
+  int GetItemCount() const override { return static_cast<int>(items_.size()); }
+
+  ItemType GetTypeAt(int index) const override { return items_[index].type; }
+
+  ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override {
+    return ui::NORMAL_SEPARATOR;
+  }
+
+  int GetCommandIdAt(int index) const override {
+    return index + command_id_base_;
+  }
+
+  base::string16 GetLabelAt(int index) const override {
+    return items_[index].label;
+  }
+
+  bool IsItemDynamicAt(int index) const override { return false; }
+
+  const gfx::FontList* GetLabelFontListAt(int index) const override {
+    return NULL;
+  }
+
+  bool GetAcceleratorAt(int index,
+                        ui::Accelerator* accelerator) const override {
     return false;
   }
 
-  virtual int GetItemCount() const override {
-    return static_cast<int>(items_.size());
-  }
+  bool IsItemCheckedAt(int index) const override { return false; }
 
-  virtual ItemType GetTypeAt(int index) const override {
-    return items_[index].type;
-  }
+  int GetGroupIdAt(int index) const override { return 0; }
 
-  virtual ui::MenuSeparatorType GetSeparatorTypeAt(
-      int index) const override {
-    return ui::NORMAL_SEPARATOR;
-  }
+  bool GetIconAt(int index, gfx::Image* icon) override { return false; }
 
-  virtual int GetCommandIdAt(int index) const override {
-    return index + command_id_base_;
-  }
-
-  virtual base::string16 GetLabelAt(int index) const override {
-    return items_[index].label;
-  }
-
-  virtual bool IsItemDynamicAt(int index) const override {
-    return false;
-  }
-
-  virtual const gfx::FontList* GetLabelFontListAt(int index) const override {
+  ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const override {
     return NULL;
   }
 
-  virtual bool GetAcceleratorAt(int index,
-                                ui::Accelerator* accelerator) const override {
-    return false;
-  }
+  bool IsEnabledAt(int index) const override { return true; }
 
-  virtual bool IsItemCheckedAt(int index) const override {
-    return false;
-  }
+  bool IsVisibleAt(int index) const override { return true; }
 
-  virtual int GetGroupIdAt(int index) const override {
-    return 0;
-  }
-
-  virtual bool GetIconAt(int index, gfx::Image* icon) override {
-    return false;
-  }
-
-  virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(
-      int index) const override {
-    return NULL;
-  }
-
-  virtual bool IsEnabledAt(int index) const override {
-    return true;
-  }
-
-  virtual bool IsVisibleAt(int index) const override {
-    return true;
-  }
-
-  virtual MenuModel* GetSubmenuModelAt(int index) const override {
+  MenuModel* GetSubmenuModelAt(int index) const override {
     return items_[index].submenu;
   }
 
-  virtual void HighlightChangedTo(int index) override {
-  }
+  void HighlightChangedTo(int index) override {}
 
-  virtual void ActivatedAt(int index) override {
-    set_last_activation(index);
-  }
+  void ActivatedAt(int index) override { set_last_activation(index); }
 
-  virtual void ActivatedAt(int index, int event_flags) override {
-    ActivatedAt(index);
-  }
+  void ActivatedAt(int index, int event_flags) override { ActivatedAt(index); }
 
-  virtual void MenuWillShow() override {
-  }
+  void MenuWillShow() override {}
 
-  virtual void MenuClosed() override {
-  }
+  void MenuClosed() override {}
 
-  virtual void SetMenuModelDelegate(
-      ui::MenuModelDelegate* delegate) override {
-  }
+  void SetMenuModelDelegate(ui::MenuModelDelegate* delegate) override {}
 
-  virtual ui::MenuModelDelegate* GetMenuModelDelegate() const override {
-    return NULL;
-  }
+  ui::MenuModelDelegate* GetMenuModelDelegate() const override { return NULL; }
 
   // Item definition.
   struct Item {
     Item(ItemType item_type,
          const std::string& item_label,
          ui::MenuModel* item_submenu)
         : type(item_type),
           label(base::ASCIIToUTF16(item_label)),
           submenu(item_submenu) {
     }
@@ skipping 23 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MenuModelBase);
 };
 
 class SubmenuModel : public MenuModelBase {
  public:
   SubmenuModel() : MenuModelBase(kSubmenuIdBase) {
     items_.push_back(Item(TYPE_COMMAND, "submenu item 0", NULL));
     items_.push_back(Item(TYPE_COMMAND, "submenu item 1", NULL));
   }
 
-  virtual ~SubmenuModel() {
-  }
+  ~SubmenuModel() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SubmenuModel);
 };
 
 class RootModel : public MenuModelBase {
  public:
   RootModel() : MenuModelBase(kRootIdBase) {
     submenu_model_.reset(new SubmenuModel);
 
     items_.push_back(Item(TYPE_COMMAND, "command 0", NULL));
     items_.push_back(Item(TYPE_CHECK, "check 1", NULL));
     items_.push_back(Item(TYPE_SEPARATOR, "", NULL));
     items_.push_back(Item(TYPE_SUBMENU, "submenu 3", submenu_model_.get()));
     items_.push_back(Item(TYPE_RADIO, "radio 4", NULL));
   }
 
-  virtual ~RootModel() {
-  }
+  ~RootModel() override {}
 
  private:
   scoped_ptr<MenuModel> submenu_model_;
 
   DISALLOW_COPY_AND_ASSIGN(RootModel);
 };
 
 }  // namespace
 
 namespace views {
@@ skipping 102 matching lines @@
     submodel->set_last_activation(-1);
   }
 
   // Check that selecting the root item is safe.  The MenuModel does
   // not care about the root so MenuModelAdapter should do nothing
   // (not hit the NOTREACHED check) when the root is selected.
   static_cast<views::MenuDelegate*>(&delegate)->SelectionChanged(menu);
 }
 
 }  // namespace views