Chromium Code Reviews| 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..e01a7fbdf91aab2da2640f99c1017020697aa29d 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,10 @@ 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 && bookmark_utils::HasManaged(model, nodes)) { |
|
not at google - send to devlin
2014/06/03 18:09:16
i was considering suggesting such a function in th
|
| + error_ = bookmark_keys::kModifyManagedError; |
| + return false; |
| + } |
| bookmark_utils::CopyToClipboard(model, nodes, cut); |
| return true; |
| } |
| @@ -381,10 +385,8 @@ bool BookmarkManagerPrivatePasteFunction::RunOnReady() { |
| EXTENSION_FUNCTION_VALIDATE(params); |
| BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile()); |
| const BookmarkNode* parent_node = GetNodeFromString(model, params->parent_id); |
| - if (!parent_node) { |
| - error_ = bookmark_keys::kNoParentError; |
| + if (!CanBeModified(parent_node)) |
| return false; |
| - } |
| bool can_paste = bookmark_utils::CanPasteFromClipboard(parent_node); |
| if (!can_paste) |
| return false; |
| @@ -419,7 +421,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; |
| } |
| @@ -433,10 +436,8 @@ bool BookmarkManagerPrivateSortChildrenFunction::RunOnReady() { |
| BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile()); |
| const BookmarkNode* parent_node = GetNodeFromString(model, params->parent_id); |
| - if (!parent_node) { |
| - error_ = bookmark_keys::kNoParentError; |
| + if (!CanBeModified(parent_node)) |
| return false; |
| - } |
| model->SortChildren(parent_node); |
| return true; |
| } |
| @@ -564,10 +565,8 @@ bool BookmarkManagerPrivateDropFunction::RunOnReady() { |
| BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile()); |
| const BookmarkNode* drop_parent = GetNodeFromString(model, params->parent_id); |
| - if (!drop_parent) { |
| - error_ = bookmark_keys::kNoParentError; |
| + if (!CanBeModified(drop_parent)) |
| return false; |
| - } |
| int drop_index; |
| if (params->index) |