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 84deefcf15911ba6d4522fadab9a2bfbc5a974d9..96de4fd68a89d99027e73f26791781f7e1dd85e9 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 |
@@ -354,6 +354,14 @@ bool ClipboardBookmarkManagerFunction::CopyOrCut(bool cut, |
BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile()); |
std::vector<const BookmarkNode*> nodes; |
EXTENSION_FUNCTION_VALIDATE(GetNodesFromVector(model, id_list, &nodes)); |
+ if (cut) { |
+ for (size_t i = 0; i < nodes.size(); ++i) { |
+ if (model->IsManaged(nodes[i])) { |
+ error_ = bookmark_keys::kModifyManagedError; |
+ return false; |
+ } |
+ } |
+ } |
bookmark_utils::CopyToClipboard(model, nodes, cut); |
return true; |
} |
@@ -385,6 +393,10 @@ bool BookmarkManagerPrivatePasteFunction::RunOnReady() { |
error_ = bookmark_keys::kNoParentError; |
return false; |
} |
+ if (model->IsManaged(parent_node)) { |
+ error_ = bookmark_keys::kModifyManagedError; |
+ return false; |
+ } |
bool can_paste = bookmark_utils::CanPasteFromClipboard(parent_node); |
if (!can_paste) |
return false; |
@@ -419,7 +431,8 @@ bool BookmarkManagerPrivateCanPasteFunction::RunOnReady() { |
error_ = bookmark_keys::kNoParentError; |
return false; |
} |
- bool can_paste = bookmark_utils::CanPasteFromClipboard(parent_node); |
+ bool can_paste = bookmark_utils::CanPasteFromClipboard(parent_node) && |
+ !model->IsManaged(parent_node); |
SetResult(new base::FundamentalValue(can_paste)); |
return true; |
} |
@@ -437,6 +450,10 @@ bool BookmarkManagerPrivateSortChildrenFunction::RunOnReady() { |
error_ = bookmark_keys::kNoParentError; |
return false; |
} |
+ if (model->IsManaged(parent_node)) { |
+ error_ = bookmark_keys::kModifyManagedError; |
+ return false; |
+ } |
model->SortChildren(parent_node); |
return true; |
} |
@@ -568,6 +585,10 @@ bool BookmarkManagerPrivateDropFunction::RunOnReady() { |
error_ = bookmark_keys::kNoParentError; |
return false; |
} |
+ if (model->IsManaged(drop_parent)) { |
+ error_ = bookmark_keys::kModifyManagedError; |
+ return false; |
+ } |
int drop_index; |
if (params->index) |