summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorian@chromium.org <ian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 04:58:48 +0000
committerian@chromium.org <ian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 04:58:48 +0000
commitdce516200cbac6100f0268c5f036e8dbddf4f8ac (patch)
tree9e758547e48369576b568c8dd46d69fb8a75f958 /app
parent91c836e0591bd3c3d874eb18d2403ce927e6be6a (diff)
downloadchromium_src-dce516200cbac6100f0268c5f036e8dbddf4f8ac.zip
chromium_src-dce516200cbac6100f0268c5f036e8dbddf4f8ac.tar.gz
chromium_src-dce516200cbac6100f0268c5f036e8dbddf4f8ac.tar.bz2
Converting the Cookies options page from a TableView to a TreeView
so that we can add in Database, LocalStorage, and Appcache next to the cookies for an origin. BUG=26713 TEST=cookies_tree_model_unittest.cc Review URL: http://codereview.chromium.org/365005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/tree_node_model.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/tree_node_model.h b/app/tree_node_model.h
index 8d8b713..2d84050 100644
--- a/app/tree_node_model.h
+++ b/app/tree_node_model.h
@@ -109,7 +109,7 @@ class TreeNode : public TreeModelNode {
int GetTotalNodeCount() const {
int count = 1; // Start with one to include the node itself.
for (size_t i = 0; i < children_->size(); ++i) {
- TreeNode<NodeType>* child = children_[i];
+ const TreeNode<NodeType>* child = children_[i];
count += child->GetTotalNodeCount();
}
return count;
@@ -245,7 +245,7 @@ class TreeNodeModel : public TreeModel {
}
NodeType* AsNode(TreeModelNode* model_node) {
- return reinterpret_cast<NodeType*>(model_node);
+ return static_cast<NodeType*>(model_node);
}
// Sets the title of the specified node.