Chromium Code Reviews| Index: components/bookmarks/browser/bookmark_utils.cc |
| diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc |
| index 304d2befbd07d5b36d3286e8b1e24010a393f884..a3e0e63eb41d32820ac9c16ebceb9cced17184e8 100644 |
| --- a/components/bookmarks/browser/bookmark_utils.cc |
| +++ b/components/bookmarks/browser/bookmark_utils.cc |
| @@ -207,7 +207,11 @@ void PasteFromClipboard(BookmarkModel* model, |
| bool CanPasteFromClipboard(BookmarkModel* model, const BookmarkNode* node) { |
| if (!node || !model->client()->CanBeEditedByUser(node)) |
| return false; |
| - return BookmarkNodeData::ClipboardContainsBookmarks(); |
| + if (BookmarkNodeData::ClipboardContainsBookmarks()) |
| + return true; |
| + if (BookmarkNodeData::ClipboardContainsURLs()) |
| + return BookmarkNodeData::WriteBookmarkToClipboardFromURL(); |
|
sky
2014/08/05 16:53:49
CanPaste shouldn't modify the clipboard.
|
| + return false; |
| } |
| std::vector<const BookmarkNode*> GetMostRecentlyModifiedUserFolders( |