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

Unified Diff: chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

Issue 242823002: Extract GetNodeByID() method from BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
Index: chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
index 9fd285771df0274c0004ba56388ba9e448dbbdc5..3044b3aa85ba862210e2cb5b1ea97042705c249f 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -132,8 +132,8 @@ const BookmarkNode* BookmarksFunction::GetBookmarkNodeFromId(
if (!GetBookmarkIdAsInt64(id_string, &id))
return NULL;
- BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
- const BookmarkNode* node = model->GetNodeByID(id);
+ const BookmarkNode* node = bookmark_utils::GetNodeByID(
+ BookmarkModelFactory::GetForProfile(GetProfile()), id);
if (!node)
error_ = keys::kNoNodeError;
@@ -528,7 +528,7 @@ bool BookmarksCreateFunction::RunImpl() {
if (!GetBookmarkIdAsInt64(*params->bookmark.parent_id, &parentId))
return false;
}
- const BookmarkNode* parent = model->GetNodeByID(parentId);
+ const BookmarkNode* parent = bookmark_utils::GetNodeByID(model, parentId);
if (!parent) {
error_ = keys::kNoParentError;
return false;
@@ -616,7 +616,7 @@ bool BookmarksMoveFunction::RunImpl() {
if (!GetBookmarkIdAsInt64(*params->destination.parent_id, &parentId))
return false;
- parent = model->GetNodeByID(parentId);
+ parent = bookmark_utils::GetNodeByID(model, parentId);
}
if (!parent) {
error_ = keys::kNoParentError;
@@ -744,7 +744,8 @@ class CreateBookmarkBucketMapper : public BookmarkBucketMapper<std::string> {
int64 parent_id_int64;
base::StringToInt64(parent_id, &parent_id_int64);
- const BookmarkNode* parent = model->GetNodeByID(parent_id_int64);
+ const BookmarkNode* parent =
+ bookmark_utils::GetNodeByID(model, parent_id_int64);
if (!parent)
return;
@@ -782,7 +783,7 @@ class RemoveBookmarksBucketMapper : public BookmarkBucketMapper<std::string> {
for (IdList::iterator it = ids.begin(); it != ids.end(); ++it) {
BookmarkModel* model = BookmarkModelFactory::GetForProfile(
Profile::FromBrowserContext(browser_context_));
- const BookmarkNode* node = model->GetNodeByID(*it);
+ const BookmarkNode* node = bookmark_utils::GetNodeByID(model, *it);
if (!node || node->is_root())
return;

Powered by Google App Engine
This is Rietveld 408576698