replace OVERRIDE and FINAL with override and final in ui/

BUG=417463 Review URL: https://codereview.chromium.org/623293004 Cr-Commit-Position: refs/heads/master@{#298839}
FairyWorld · Oct 9, 2014 · 3b3d52b · 3b3d52b
1 parent 002d029
commit 3b3d52b
Show file tree

Hide file tree

Showing 712 changed files with 5,436 additions and 5,436 deletions.
diff --git a/ui/accessibility/ax_serializable_tree.cc b/ui/accessibility/ax_serializable_tree.cc
@@ -20,44 +20,44 @@ class AX_EXPORT AXTreeSourceAdapter : public AXTreeSource<const AXNode*> {
   virtual ~AXTreeSourceAdapter() {}
 
   // AXTreeSource implementation.
-  virtual AXNode* GetRoot() const OVERRIDE {
+  virtual AXNode* GetRoot() const override {
     return tree_->GetRoot();
   }
 
-  virtual AXNode* GetFromId(int32 id) const OVERRIDE {
+  virtual AXNode* GetFromId(int32 id) const override {
     return tree_->GetFromId(id);
   }
 
-  virtual int32 GetId(const AXNode* node) const OVERRIDE {
+  virtual int32 GetId(const AXNode* node) const override {
     return node->id();
   }
 
   virtual void GetChildren(
       const AXNode* node,
-      std::vector<const AXNode*>* out_children) const OVERRIDE {
+      std::vector<const AXNode*>* out_children) const override {
     for (int i = 0; i < node->child_count(); ++i)
       out_children->push_back(node->ChildAtIndex(i));
   }
 
-  virtual AXNode* GetParent(const AXNode* node) const OVERRIDE {
+  virtual AXNode* GetParent(const AXNode* node) const override {
     return node->parent();
   }
 
-  virtual bool IsValid(const AXNode* node) const OVERRIDE {
+  virtual bool IsValid(const AXNode* node) const override {
     return node != NULL;
   }
 
   virtual bool IsEqual(const AXNode* node1,
-                       const AXNode* node2) const OVERRIDE {
+                       const AXNode* node2) const override {
     return node1 == node2;
   }
 
-  virtual const AXNode* GetNull() const OVERRIDE {
+  virtual const AXNode* GetNull() const override {
     return NULL;
   }
 
   virtual void SerializeNode(
-      const AXNode* node, AXNodeData* out_data) const OVERRIDE {
+      const AXNode* node, AXNodeData* out_data) const override {
     *out_data = node->data();
   }
 

diff --git a/ui/accessibility/ax_tree_unittest.cc b/ui/accessibility/ax_tree_unittest.cc
@@ -16,27 +16,27 @@ namespace {
 
 class FakeAXTreeDelegate : public AXTreeDelegate {
  public:
-  virtual void OnNodeWillBeDeleted(AXNode* node) OVERRIDE {
+  virtual void OnNodeWillBeDeleted(AXNode* node) override {
     deleted_ids_.push_back(node->id());
   }
 
-  virtual void OnNodeCreated(AXNode* node) OVERRIDE {
+  virtual void OnNodeCreated(AXNode* node) override {
     created_ids_.push_back(node->id());
   }
 
-  virtual void OnNodeChanged(AXNode* node) OVERRIDE {
+  virtual void OnNodeChanged(AXNode* node) override {
     changed_ids_.push_back(node->id());
   }
 
-  virtual void OnNodeCreationFinished(AXNode* node) OVERRIDE {
+  virtual void OnNodeCreationFinished(AXNode* node) override {
     creation_finished_ids_.push_back(node->id());
   }
 
-  virtual void OnNodeChangeFinished(AXNode* node) OVERRIDE {
+  virtual void OnNodeChangeFinished(AXNode* node) override {
     change_finished_ids_.push_back(node->id());
   }
 
-  virtual void OnRootChanged(AXNode* new_root) OVERRIDE {
+  virtual void OnRootChanged(AXNode* new_root) override {
     new_root_ids_.push_back(new_root->id());
   }
 

diff --git a/ui/accessibility/platform/ax_platform_node_base.h b/ui/accessibility/platform/ax_platform_node_base.h
@@ -26,8 +26,8 @@ class AXPlatformNodeBase : public AXPlatformNode {
   gfx::NativeViewAccessible ChildAtIndex(int index);
 
   // AXPlatformNode
-  virtual void Destroy() OVERRIDE;
-  virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
+  virtual void Destroy() override;
+  virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
 
  protected:
   AXPlatformNodeBase();

diff --git a/ui/accessibility/platform/ax_platform_node_mac.h b/ui/accessibility/platform/ax_platform_node_mac.h
@@ -18,8 +18,8 @@ class AXPlatformNodeMac : public AXPlatformNodeBase {
   AXPlatformNodeMac();
 
   // AXPlatformNode.
-  virtual void Destroy() OVERRIDE;
-  virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
+  virtual void Destroy() override;
+  virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
 
  private:
   virtual ~AXPlatformNodeMac();

diff --git a/ui/app_list/app_list_folder_item.cc b/ui/app_list/app_list_folder_item.cc
@@ -47,7 +47,7 @@ class FolderImageSource : public gfx::CanvasImageSource {
   }
 
   // gfx::CanvasImageSource overrides:
-  virtual void Draw(gfx::Canvas* canvas) OVERRIDE {
+  virtual void Draw(gfx::Canvas* canvas) override {
     // Draw folder circle.
     gfx::Point center = gfx::Point(size().width() / 2 , size().height() / 2);
     SkPaint paint;

diff --git a/ui/app_list/app_list_folder_item.h b/ui/app_list/app_list_folder_item.h
@@ -59,13 +59,13 @@ class APP_LIST_EXPORT AppListFolderItem : public AppListItem,
   FolderType folder_type() const { return folder_type_; }
 
   // AppListItem
-  virtual void Activate(int event_flags) OVERRIDE;
-  virtual const char* GetItemType() const OVERRIDE;
-  virtual ui::MenuModel* GetContextMenuModel() OVERRIDE;
-  virtual AppListItem* FindChildItem(const std::string& id) OVERRIDE;
-  virtual size_t ChildItemCount() const OVERRIDE;
-  virtual void OnExtensionPreferenceChanged() OVERRIDE;
-  virtual bool CompareForTest(const AppListItem* other) const OVERRIDE;
+  virtual void Activate(int event_flags) override;
+  virtual const char* GetItemType() const override;
+  virtual ui::MenuModel* GetContextMenuModel() override;
+  virtual AppListItem* FindChildItem(const std::string& id) override;
+  virtual size_t ChildItemCount() const override;
+  virtual void OnExtensionPreferenceChanged() override;
+  virtual bool CompareForTest(const AppListItem* other) const override;
 
   // Calculates the top item icons' bounds inside |folder_icon_bounds|.
   // Returns the bounds of top item icons in sequence of top left, top right,
@@ -77,15 +77,15 @@ class APP_LIST_EXPORT AppListFolderItem : public AppListItem,
 
  private:
   // AppListItemObserver
-  virtual void ItemIconChanged() OVERRIDE;
+  virtual void ItemIconChanged() override;
 
   // AppListItemListObserver
-  virtual void OnListItemAdded(size_t index, AppListItem* item) OVERRIDE;
+  virtual void OnListItemAdded(size_t index, AppListItem* item) override;
   virtual void OnListItemRemoved(size_t index,
-                                 AppListItem* item) OVERRIDE;;
+                                 AppListItem* item) override;;
   virtual void OnListItemMoved(size_t from_index,
                                size_t to_index,
-                               AppListItem* item) OVERRIDE;
+                               AppListItem* item) override;
 
   void UpdateTopItems();
 

diff --git a/ui/app_list/app_list_item_list_unittest.cc b/ui/app_list/app_list_item_list_unittest.cc
@@ -23,17 +23,17 @@ class TestObserver : public AppListItemListObserver {
   }
 
   // AppListItemListObserver overriden:
-  virtual void OnListItemAdded(size_t index, AppListItem* item) OVERRIDE {
+  virtual void OnListItemAdded(size_t index, AppListItem* item) override {
     ++items_added_;
   }
 
-  virtual void OnListItemRemoved(size_t index, AppListItem* item) OVERRIDE {
+  virtual void OnListItemRemoved(size_t index, AppListItem* item) override {
     ++items_removed_;
   }
 
   virtual void OnListItemMoved(size_t from_index,
                                size_t to_index,
-                               AppListItem* item) OVERRIDE {
+                               AppListItem* item) override {
     ++items_moved_;
   }
 
@@ -67,11 +67,11 @@ class AppListItemListTest : public testing::Test {
   virtual ~AppListItemListTest() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     item_list_.AddObserver(&observer_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     item_list_.RemoveObserver(&observer_);
   }
 

diff --git a/ui/app_list/app_list_menu.h b/ui/app_list/app_list_menu.h
@@ -32,12 +32,12 @@ class AppListMenu : public ui::SimpleMenuModel::Delegate {
  private:
   void InitMenu();
 
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  virtual bool IsCommandIdChecked(int command_id) const override;
+  virtual bool IsCommandIdEnabled(int command_id) const override;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+      ui::Accelerator* accelerator) override;
+  virtual void ExecuteCommand(int command_id, int event_flags) override;
 
   ui::SimpleMenuModel menu_model_;
   AppListViewDelegate* delegate_;

diff --git a/ui/app_list/app_list_model.h b/ui/app_list/app_list_model.h
@@ -135,7 +135,7 @@ class APP_LIST_EXPORT AppListModel : public AppListItemListObserver {
   // AppListItemListObserver
   virtual void OnListItemMoved(size_t from_index,
                                size_t to_index,
-                               AppListItem* item) OVERRIDE;
+                               AppListItem* item) override;
 
   // Returns an existing folder matching |folder_id| or creates a new folder.
   AppListFolderItem* FindOrCreateFolderItem(const std::string& folder_id);

diff --git a/ui/app_list/app_list_model_unittest.cc b/ui/app_list/app_list_model_unittest.cc
@@ -33,19 +33,19 @@ class TestObserver : public AppListModelObserver {
   }
 
   // AppListModelObserver
-  virtual void OnAppListModelStatusChanged() OVERRIDE {
+  virtual void OnAppListModelStatusChanged() override {
     ++status_changed_count_;
   }
 
-  virtual void OnAppListItemAdded(AppListItem* item) OVERRIDE {
+  virtual void OnAppListItemAdded(AppListItem* item) override {
     items_added_++;
   }
 
-  virtual void OnAppListItemWillBeDeleted(AppListItem* item) OVERRIDE {
+  virtual void OnAppListItemWillBeDeleted(AppListItem* item) override {
     items_removed_++;
   }
 
-  virtual void OnAppListItemUpdated(AppListItem* item) OVERRIDE {
+  virtual void OnAppListItemUpdated(AppListItem* item) override {
     items_updated_++;
   }
 
@@ -78,10 +78,10 @@ class AppListModelTest : public testing::Test {
   virtual ~AppListModelTest() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     model_.AddObserver(&observer_);
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     model_.RemoveObserver(&observer_);
   }
 
@@ -237,10 +237,10 @@ class AppListModelFolderTest : public AppListModelTest {
   virtual ~AppListModelFolderTest() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     AppListModelTest::SetUp();
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     AppListModelTest::TearDown();
   }
 

diff --git a/ui/app_list/cocoa/app_list_view_controller.mm b/ui/app_list/cocoa/app_list_view_controller.mm
@@ -87,8 +87,8 @@ - (void)revealSearchResults:(BOOL)show;
 
  private:
   // Overridden from app_list::AppListViewDelegateObserver:
-  virtual void OnProfilesChanged() OVERRIDE;
-  virtual void OnShutdown() OVERRIDE;
+  virtual void OnProfilesChanged() override;
+  virtual void OnShutdown() override;
 
   AppListViewController* parent_;  // Weak. Owns us.
 

diff --git a/ui/app_list/cocoa/app_list_view_controller_unittest.mm b/ui/app_list/cocoa/app_list_view_controller_unittest.mm
@@ -17,15 +17,15 @@
  public:
   AppListViewControllerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     app_list_view_controller_.reset([[AppListViewController alloc] init]);
     delegate_.reset(new AppListTestViewDelegate);
     [app_list_view_controller_ setDelegate:delegate_.get()];
     SetUpWithGridController([app_list_view_controller_ appsGridController]);
     [[test_window() contentView] addSubview:[app_list_view_controller_ view]];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     [app_list_view_controller_ setDelegate:NULL];
     app_list_view_controller_.reset();
     AppsGridControllerTestHelper::TearDown();

diff --git a/ui/app_list/cocoa/app_list_window_controller_unittest.mm b/ui/app_list/cocoa/app_list_window_controller_unittest.mm
@@ -19,7 +19,7 @@
   AppListWindowControllerTest();
 
  protected:
-  virtual void TearDown() OVERRIDE;
+  virtual void TearDown() override;
 
   base::scoped_nsobject<AppListWindowController> controller_;
 

diff --git a/ui/app_list/cocoa/apps_grid_controller.mm b/ui/app_list/cocoa/apps_grid_controller.mm
@@ -98,16 +98,16 @@ - (BOOL)moveSelectionByDelta:(int)indexDelta;
 
  private:
   // Overridden from AppListItemListObserver:
-  virtual void OnListItemAdded(size_t index, AppListItem* item) OVERRIDE {
+  virtual void OnListItemAdded(size_t index, AppListItem* item) override {
     [parent_ listItemAdded:index
                       item:item];
   }
-  virtual void OnListItemRemoved(size_t index, AppListItem* item) OVERRIDE {
+  virtual void OnListItemRemoved(size_t index, AppListItem* item) override {
     [parent_ listItemRemoved:index];
   }
   virtual void OnListItemMoved(size_t from_index,
                                size_t to_index,
-                               AppListItem* item) OVERRIDE {
+                               AppListItem* item) override {
     [parent_ listItemMovedFromIndex:from_index
                        toModelIndex:to_index];
   }

diff --git a/ui/app_list/cocoa/apps_grid_controller_unittest.mm b/ui/app_list/cocoa/apps_grid_controller_unittest.mm
@@ -96,7 +96,7 @@ - (NSInteger)pagerSegmentAtLocation:(NSPoint)locationInWindow {
     return [attributes objectForKey:NSForegroundColorAttributeName];
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     owned_apps_grid_controller_.reset([[AppsGridController alloc] init]);
     owned_delegate_.reset(new AppListTestViewDelegate);
     [owned_apps_grid_controller_ setDelegate:owned_delegate_.get()];
@@ -108,7 +108,7 @@ virtual void SetUp() OVERRIDE {
         [apps_grid_controller_ collectionViewAtPageIndex:0]];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     [owned_apps_grid_controller_ setDelegate:NULL];
     owned_apps_grid_controller_.reset();
     AppsGridControllerTestHelper::TearDown();
@@ -145,7 +145,7 @@ void SetMenuReadyForTesting(bool ready) {
     menu_ready_ = ready;
   }
 
-  virtual ui::MenuModel* GetContextMenuModel() OVERRIDE {
+  virtual ui::MenuModel* GetContextMenuModel() override {
     if (!menu_ready_)
       return NULL;
 

diff --git a/ui/app_list/cocoa/apps_grid_view_item.mm b/ui/app_list/cocoa/apps_grid_view_item.mm
@@ -69,10 +69,10 @@ - (void)setPercentDownloaded:(int)percent;
   AppListItem* model() { return model_; }
   NSMenu* GetContextMenu();
 
-  virtual void ItemIconChanged() OVERRIDE;
-  virtual void ItemNameChanged() OVERRIDE;
-  virtual void ItemIsInstallingChanged() OVERRIDE;
-  virtual void ItemPercentDownloadedChanged() OVERRIDE;
+  virtual void ItemIconChanged() override;
+  virtual void ItemNameChanged() override;
+  virtual void ItemIsInstallingChanged() override;
+  virtual void ItemPercentDownloadedChanged() override;
 
  private:
   AppsGridViewItem* parent_;  // Weak. Owns us.

diff --git a/ui/app_list/cocoa/apps_search_box_controller.mm b/ui/app_list/cocoa/apps_search_box_controller.mm
@@ -52,11 +52,11 @@ - (void)addSubviews;
 
   void SetSearchText(const base::string16& text);
 
-  virtual void IconChanged() OVERRIDE;
-  virtual void SpeechRecognitionButtonPropChanged() OVERRIDE;
-  virtual void HintTextChanged() OVERRIDE;
-  virtual void SelectionModelChanged() OVERRIDE;
-  virtual void TextChanged() OVERRIDE;
+  virtual void IconChanged() override;
+  virtual void SpeechRecognitionButtonPropChanged() override;
+  virtual void HintTextChanged() override;
+  virtual void SelectionModelChanged() override;
+  virtual void TextChanged() override;
 
  private:
   SearchBoxModel* GetModel();