Index: chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc |
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc |
index 640cd0041d69a128c5fb717923c9f50d4e92c64c..78203725167384c62ff2777f775dfa8bae95cddc 100644 |
--- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc |
+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc |
@@ -14,7 +14,6 @@ |
#include "base/values.h" |
#include "chrome/browser/bookmarks/bookmark_model_factory.h" |
#include "chrome/browser/bookmarks/bookmark_stats.h" |
-#include "chrome/browser/bookmarks/chrome_bookmark_client.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h" |
#include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h" |
@@ -30,6 +29,7 @@ |
#include "components/bookmarks/browser/bookmark_node_data.h" |
#include "components/bookmarks/browser/bookmark_utils.h" |
#include "components/bookmarks/browser/scoped_group_bookmark_actions.h" |
+#include "components/bookmarks/managed/managed_bookmark_service.h" |
#include "components/enhanced_bookmarks/enhanced_bookmark_model.h" |
#include "components/undo/bookmark_undo_service.h" |
#include "components/user_prefs/user_prefs.h" |
@@ -365,10 +365,10 @@ void BookmarkManagerPrivateDragEventRouter::ClearBookmarkNodeData() { |
bool ClipboardBookmarkManagerFunction::CopyOrCut(bool cut, |
const std::vector<std::string>& id_list) { |
BookmarkModel* model = GetBookmarkModel(); |
- ChromeBookmarkClient* client = GetChromeBookmarkClient(); |
+ bookmarks::ManagedBookmarkService* managed = GetManagedBookmarkService(); |
std::vector<const BookmarkNode*> nodes; |
EXTENSION_FUNCTION_VALIDATE(GetNodesFromVector(model, id_list, &nodes)); |
- if (cut && bookmarks::HasDescendantsOf(nodes, client->managed_node())) { |
+ if (cut && bookmarks::HasDescendantsOf(nodes, managed->managed_node())) { |
error_ = bookmark_keys::kModifyManagedError; |
return false; |
} |
@@ -633,11 +633,11 @@ bool BookmarkManagerPrivateGetSubtreeFunction::RunOnReady() { |
} |
std::vector<linked_ptr<api::bookmarks::BookmarkTreeNode> > nodes; |
- ChromeBookmarkClient* client = GetChromeBookmarkClient(); |
+ bookmarks::ManagedBookmarkService* managed = GetManagedBookmarkService(); |
if (params->folders_only) |
- bookmark_api_helpers::AddNodeFoldersOnly(client, node, &nodes, true); |
+ bookmark_api_helpers::AddNodeFoldersOnly(managed, node, &nodes, true); |
else |
- bookmark_api_helpers::AddNode(client, node, &nodes, true); |
+ bookmark_api_helpers::AddNode(managed, node, &nodes, true); |
results_ = GetSubtree::Results::Create(nodes); |
return true; |
} |
@@ -669,8 +669,8 @@ bool BookmarkManagerPrivateCreateWithMetaInfoFunction::RunOnReady() { |
return false; |
scoped_ptr<api::bookmarks::BookmarkTreeNode> result_node( |
- bookmark_api_helpers::GetBookmarkTreeNode( |
- GetChromeBookmarkClient(), node, false, false)); |
+ bookmark_api_helpers::GetBookmarkTreeNode(GetManagedBookmarkService(), |
+ node, false, false)); |
results_ = CreateWithMetaInfo::Results::Create(*result_node); |
return true; |
@@ -797,13 +797,13 @@ bool BookmarkManagerPrivateRemoveTreesFunction::RunOnReady() { |
EXTENSION_FUNCTION_VALIDATE(params); |
BookmarkModel* model = GetBookmarkModel(); |
- ChromeBookmarkClient* client = GetChromeBookmarkClient(); |
+ bookmarks::ManagedBookmarkService* managed = GetManagedBookmarkService(); |
bookmarks::ScopedGroupBookmarkActions group_deletes(model); |
int64 id; |
for (size_t i = 0; i < params->id_list.size(); ++i) { |
if (!GetBookmarkIdAsInt64(params->id_list[i], &id)) |
return false; |
- if (!bookmark_api_helpers::RemoveNode(model, client, id, true, &error_)) |
+ if (!bookmark_api_helpers::RemoveNode(model, managed, id, true, &error_)) |
return false; |
} |