Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: components/bookmarks/browser/bookmark_utils.cc

Issue 437423005: Show paste option on right click of bookmark bar if some URL is copied from outside browser or from… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added unit tests Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..fd0211adb70fad22e39fa955041c9086629c95b3 100644
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -188,6 +188,19 @@ void CopyToClipboard(BookmarkModel* model,
}
}
+bool ClipboardContainsValidUrl(base::string16& url_text) {
+ if (!ui::Clipboard::GetForCurrentThread()->IsFormatAvailable(
+ ui::Clipboard::GetUrlWFormatType(), ui::CLIPBOARD_TYPE_COPY_PASTE))
+ return false;
+
+ ui::Clipboard::GetForCurrentThread()->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE,
+ &url_text);
+ GURL url(url_text);
+ if (!url.is_valid())
+ return false;
+ return true;
+}
+
void PasteFromClipboard(BookmarkModel* model,
const BookmarkNode* parent,
int index) {
@@ -195,8 +208,16 @@ void PasteFromClipboard(BookmarkModel* model,
return;
BookmarkNodeData bookmark_data;
+ base::string16 url_text;
if (!bookmark_data.ReadFromClipboard(ui::CLIPBOARD_TYPE_COPY_PASTE))
return;
+ else if (!ClipboardContainsValidUrl(url_text))
+ return;
+ GURL url(url_text);
+ BookmarkNode node(url);
+ node.SetTitle(url_text);
+ BookmarkNodeData bookmark(&node);
+ bookmark_data = bookmark;
if (index == -1)
index = parent->child_count();
@@ -207,7 +228,11 @@ void PasteFromClipboard(BookmarkModel* model,
bool CanPasteFromClipboard(BookmarkModel* model, const BookmarkNode* node) {
if (!node || !model->client()->CanBeEditedByUser(node))
return false;
- return BookmarkNodeData::ClipboardContainsBookmarks();
+ base::string16 url_text;
+ if (BookmarkNodeData::ClipboardContainsBookmarks() ||
+ ClipboardContainsValidUrl(url_text))
+ return true;
+ return false;
}
std::vector<const BookmarkNode*> GetMostRecentlyModifiedUserFolders(

Powered by Google App Engine
This is Rietveld 408576698