summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 23:27:29 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 23:27:29 +0000
commit2d48ee84a9106c6c940f2eca90b1df2f4f9e8b6f (patch)
treec03683aaf8823ef3749c9dbc5795d2ec04ba7d9a /chrome/browser/extensions
parent7b405112c0556e36644b1cd8aa6f253952b4b89e (diff)
downloadchromium_src-2d48ee84a9106c6c940f2eca90b1df2f4f9e8b6f.zip
chromium_src-2d48ee84a9106c6c940f2eca90b1df2f4f9e8b6f.tar.gz
chromium_src-2d48ee84a9106c6c940f2eca90b1df2f4f9e8b6f.tar.bz2
Rename TreeNode::GetParent() to TreeNode::parent(). Part 2
This is part of a serie of patches to make the TreeNode API more closer to style used in the Views Tree API (see views/view.h for reference). BUG=None TEST=None Review URL: http://codereview.chromium.org/6626076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_bookmark_helpers.cc4
-rw-r--r--chrome/browser/extensions/extension_bookmark_manager_api.cc2
-rw-r--r--chrome/browser/extensions/extension_bookmarks_module.cc8
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extension_bookmark_helpers.cc b/chrome/browser/extensions/extension_bookmark_helpers.cc
index 6829cc4..eeceed8 100644
--- a/chrome/browser/extensions/extension_bookmark_helpers.cc
+++ b/chrome/browser/extensions/extension_bookmark_helpers.cc
@@ -20,7 +20,7 @@ DictionaryValue* GetNodeDictionary(const BookmarkNode* node,
DictionaryValue* dict = new DictionaryValue();
dict->SetString(keys::kIdKey, base::Int64ToString(node->id()));
- const BookmarkNode* parent = node->GetParent();
+ const BookmarkNode* parent = node->parent();
if (parent) {
dict->SetString(keys::kParentIdKey, base::Int64ToString(parent->id()));
dict->SetInteger(keys::kIndexKey, parent->GetIndexOf(node));
@@ -100,7 +100,7 @@ bool RemoveNode(BookmarkModel* model,
return false;
}
- const BookmarkNode* parent = node->GetParent();
+ const BookmarkNode* parent = node->parent();
int index = parent->GetIndexOf(node);
model->Remove(parent, index);
return true;
diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.cc b/chrome/browser/extensions/extension_bookmark_manager_api.cc
index bdb960d..d351739 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_api.cc
+++ b/chrome/browser/extensions/extension_bookmark_manager_api.cc
@@ -80,7 +80,7 @@ void AddNodeToList(ListValue* list, const BookmarkNode& node) {
std::string id_string = base::Int64ToString(node.id());
dict->SetString(keys::kIdKey, id_string);
- std::string parent_id_string = base::Int64ToString(node.GetParent()->id());
+ std::string parent_id_string = base::Int64ToString(node.parent()->id());
dict->SetString(keys::kParentIdKey, parent_id_string);
if (node.is_url())
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc
index 706eb36..8616457 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.cc
+++ b/chrome/browser/extensions/extension_bookmarks_module.cc
@@ -436,7 +436,7 @@ bool CreateBookmarkFunction::RunImpl() {
error_ = keys::kNoParentError;
return false;
}
- if (parent->GetParent() == NULL) { // Can't create children of the root.
+ if (parent->parent() == NULL) { // Can't create children of the root.
error_ = keys::kNoParentError;
return false;
}
@@ -517,7 +517,7 @@ bool MoveBookmarkFunction::RunImpl() {
const BookmarkNode* parent = NULL;
if (!destination->HasKey(keys::kParentIdKey)) {
// Optional, defaults to current parent.
- parent = node->GetParent();
+ parent = node->parent();
} else {
std::string parentId_string;
EXTENSION_FUNCTION_VALIDATE(destination->GetString(keys::kParentIdKey,
@@ -692,11 +692,11 @@ class RemoveBookmarksBucketMapper : public BookmarkBucketMapper<std::string> {
for (IdList::iterator it = ids.begin(); it != ids.end(); ++it) {
BookmarkModel* model = profile_->GetBookmarkModel();
const BookmarkNode* node = model->GetNodeByID(*it);
- if (!node || !node->GetParent())
+ if (!node || !node->parent())
return;
std::string bucket_id;
- bucket_id += UTF16ToUTF8(node->GetParent()->GetTitle());
+ bucket_id += UTF16ToUTF8(node->parent()->GetTitle());
bucket_id += UTF16ToUTF8(node->GetTitle());
bucket_id += node->GetURL().spec();
buckets->push_back(GetBucket(base::SHA1HashString(bucket_id)));