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

Unified Diff: ui/base/models/tree_node_model.h

Issue 1081103008: Update {virtual,override} to follow C++11 style in ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/base/ime/chromeos/ime_keyboard_x11_unittest.cc ('k') | ui/base/resource/resource_bundle_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/models/tree_node_model.h
diff --git a/ui/base/models/tree_node_model.h b/ui/base/models/tree_node_model.h
index 5df2481b89df2865294fcaec73e3772b73c4860d..3ebbcee20500390d43e87817c9f9b17abc2dbb35 100644
--- a/ui/base/models/tree_node_model.h
+++ b/ui/base/models/tree_node_model.h
@@ -68,7 +68,7 @@ class TreeNode : public TreeModelNode {
explicit TreeNode(const base::string16& title)
: title_(title), parent_(NULL) {}
- virtual ~TreeNode() {}
+ ~TreeNode() override {}
// Adds |node| as a child of this node, at |index|.
virtual void Add(NodeType* node, int index) {
@@ -154,7 +154,7 @@ class TreeNode : public TreeModelNode {
virtual void SetTitle(const base::string16& title) { title_ = title; }
// TreeModelNode:
- virtual const base::string16& GetTitle() const override { return title_; }
+ const base::string16& GetTitle() const override { return title_; }
// Returns true if this == ancestor, or one of this nodes parents is
// ancestor.
@@ -212,7 +212,7 @@ class TreeNodeModel : public TreeModel {
// Creates a TreeNodeModel with the specified root node. The root is owned
// by the TreeNodeModel.
explicit TreeNodeModel(NodeType* root) : root_(root) {}
- virtual ~TreeNodeModel() {}
+ virtual ~TreeNodeModel() override {}
NodeType* AsNode(TreeModelNode* model_node) {
return static_cast<NodeType*>(model_node);
@@ -251,40 +251,40 @@ class TreeNodeModel : public TreeModel {
}
// TreeModel:
- virtual NodeType* GetRoot() override {
+ NodeType* GetRoot() override {
return root_.get();
}
- virtual int GetChildCount(TreeModelNode* parent) override {
+ int GetChildCount(TreeModelNode* parent) override {
DCHECK(parent);
return AsNode(parent)->child_count();
}
- virtual NodeType* GetChild(TreeModelNode* parent, int index) override {
+ NodeType* GetChild(TreeModelNode* parent, int index) override {
DCHECK(parent);
return AsNode(parent)->GetChild(index);
}
- virtual int GetIndexOf(TreeModelNode* parent, TreeModelNode* child) override {
+ int GetIndexOf(TreeModelNode* parent, TreeModelNode* child) override {
DCHECK(parent);
return AsNode(parent)->GetIndexOf(AsNode(child));
}
- virtual TreeModelNode* GetParent(TreeModelNode* node) override {
+ TreeModelNode* GetParent(TreeModelNode* node) override {
DCHECK(node);
return AsNode(node)->parent();
}
- virtual void AddObserver(TreeModelObserver* observer) override {
+ void AddObserver(TreeModelObserver* observer) override {
observer_list_.AddObserver(observer);
}
- virtual void RemoveObserver(TreeModelObserver* observer) override {
+ void RemoveObserver(TreeModelObserver* observer) override {
observer_list_.RemoveObserver(observer);
}
- virtual void SetTitle(TreeModelNode* node,
- const base::string16& title) override {
+ void SetTitle(TreeModelNode* node,
+ const base::string16& title) override {
DCHECK(node);
AsNode(node)->SetTitle(title);
NotifyObserverTreeNodeChanged(node);
« no previous file with comments | « ui/base/ime/chromeos/ime_keyboard_x11_unittest.cc ('k') | ui/base/resource/resource_bundle_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698