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..b75a3833e796af155c03aa23c69fa903df1caa65 100644 |
| --- a/components/bookmarks/browser/bookmark_utils.cc |
| +++ b/components/bookmarks/browser/bookmark_utils.cc |
| @@ -142,6 +142,18 @@ std::string TruncateUrl(const std::string& url) { |
| return url.substr(0, kCleanedUpUrlMaxLength); |
| } |
| +// Returns URL if present in clipboard |
|
sky
2014/09/08 16:26:18
Returns the URL from the clipboard. If there is no
|
| +GURL GetUrlFromClipboard() { |
| + base::string16 url_text; |
| + if (!ui::Clipboard::GetForCurrentThread()->IsFormatAvailable( |
| + ui::Clipboard::GetUrlWFormatType(), ui::CLIPBOARD_TYPE_COPY_PASTE)) |
| + return GURL(); |
| + |
| + ui::Clipboard::GetForCurrentThread()->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, |
| + &url_text); |
| + return GURL(url_text); |
| +} |
| + |
| } // namespace |
| QueryFields::QueryFields() {} |
| @@ -195,9 +207,14 @@ void PasteFromClipboard(BookmarkModel* model, |
| return; |
| BookmarkNodeData bookmark_data; |
| - if (!bookmark_data.ReadFromClipboard(ui::CLIPBOARD_TYPE_COPY_PASTE)) |
| - return; |
| - |
| + if (!bookmark_data.ReadFromClipboard(ui::CLIPBOARD_TYPE_COPY_PASTE)) { |
| + GURL url = GetUrlFromClipboard(); |
| + if (!url.is_valid()) |
| + return; |
| + BookmarkNode node(url); |
| + node.SetTitle(base::ASCIIToUTF16(url.spec())); |
| + bookmark_data = BookmarkNodeData(&node); |
| + } |
| if (index == -1) |
| index = parent->child_count(); |
| ScopedGroupBookmarkActions group_paste(model); |
| @@ -207,7 +224,8 @@ void PasteFromClipboard(BookmarkModel* model, |
| bool CanPasteFromClipboard(BookmarkModel* model, const BookmarkNode* node) { |
| if (!node || !model->client()->CanBeEditedByUser(node)) |
| return false; |
| - return BookmarkNodeData::ClipboardContainsBookmarks(); |
| + return (BookmarkNodeData::ClipboardContainsBookmarks() || |
| + GetUrlFromClipboard().is_valid()); |
| } |
| std::vector<const BookmarkNode*> GetMostRecentlyModifiedUserFolders( |