Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(982)

Unified Diff: ui/views/focus/focus_traversal_unittest.cc

Issue 679233002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/focus/focus_manager_unittest.cc ('k') | ui/views/layout/box_layout.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/focus/focus_traversal_unittest.cc
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index db55e9d65ea451c9ceff24573a98ba6127e3efe2..cd24bd505a4632d9f61e19eb9267d97f892a0e5c 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -89,8 +89,8 @@ const int kThumbnailSuperStarID = count++;
class DummyComboboxModel : public ui::ComboboxModel {
public:
// Overridden from ui::ComboboxModel:
- virtual int GetItemCount() const override { return 10; }
- virtual base::string16 GetItemAt(int index) override {
+ int GetItemCount() const override { return 10; }
+ base::string16 GetItemAt(int index) override {
return ASCIIToUTF16("Item ") + base::IntToString16(index);
}
};
@@ -108,7 +108,7 @@ class PaneView : public View, public FocusTraversable {
}
// Overridden from View:
- virtual FocusTraversable* GetPaneFocusTraversable() override {
+ FocusTraversable* GetPaneFocusTraversable() override {
if (focus_search_)
return this;
else
@@ -116,15 +116,9 @@ class PaneView : public View, public FocusTraversable {
}
// Overridden from FocusTraversable:
- virtual views::FocusSearch* GetFocusSearch() override {
- return focus_search_;
- }
- virtual FocusTraversable* GetFocusTraversableParent() override {
- return NULL;
- }
- virtual View* GetFocusTraversableParentView() override {
- return NULL;
- }
+ views::FocusSearch* GetFocusSearch() override { return focus_search_; }
+ FocusTraversable* GetFocusTraversableParent() override { return NULL; }
+ View* GetFocusTraversableParentView() override { return NULL; }
private:
FocusSearch* focus_search_;
@@ -140,17 +134,17 @@ class BorderView : public NativeViewHost {
SetFocusable(false);
}
- virtual ~BorderView() {}
+ ~BorderView() override {}
virtual internal::RootView* GetContentsRootView() {
return static_cast<internal::RootView*>(widget_->GetRootView());
}
- virtual FocusTraversable* GetFocusTraversable() override {
+ FocusTraversable* GetFocusTraversable() override {
return static_cast<internal::RootView*>(widget_->GetRootView());
}
- virtual void ViewHierarchyChanged(
+ void ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) override {
NativeViewHost::ViewHierarchyChanged(details);
@@ -183,9 +177,9 @@ class BorderView : public NativeViewHost {
class FocusTraversalTest : public FocusManagerTest {
public:
- virtual ~FocusTraversalTest();
+ ~FocusTraversalTest() override;
- virtual void InitContentView() override;
+ void InitContentView() override;
protected:
FocusTraversalTest();
« no previous file with comments | « ui/views/focus/focus_manager_unittest.cc ('k') | ui/views/layout/box_layout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698