Show paste option on right click of bookmark bar if some URL is copied from outside browser or from…

components/bookmarks/browser/bookmark_utils.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/bookmarks/browser/bookmark_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
@@ skipping 124 matching lines @@
 
   // If we're in the middle of an escape sequence, truncate just before it.
   if (url[kCleanedUpUrlMaxLength - 1] == '%')
     return url.substr(0, kCleanedUpUrlMaxLength - 1);
   if (url[kCleanedUpUrlMaxLength - 2] == '%')
     return url.substr(0, kCleanedUpUrlMaxLength - 2);
 
   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 URL an empty URL is returned.

+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() {}
 QueryFields::~QueryFields() {}
 
 void CloneBookmarkNode(BookmarkModel* model,
                        const std::vector<BookmarkNodeData::Element>& elements,
                        const BookmarkNode* parent,
                        int index_to_add_at,
                        bool reset_node_times) {
@@ skipping 33 matching lines @@
   }
 }
 
 void PasteFromClipboard(BookmarkModel* model,
                         const BookmarkNode* parent,
                         int index) {
   if (!parent)
     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);
   CloneBookmarkNode(model, bookmark_data.elements, parent, index, true);
 }
 
 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(
     BookmarkModel* model,
     size_t max_count) {
   std::vector<const BookmarkNode*> nodes;
   ui::TreeNodeIterator<const BookmarkNode> iterator(model->root_node(),
                                                     PruneInvisibleFolders);
 
   while (iterator.has_next()) {
@@ skipping 216 matching lines @@
   }
   return false;
 }
 
 const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64 id) {
   // TODO(sky): TreeNode needs a method that visits all nodes using a predicate.
   return GetNodeByID(model->root_node(), id);
 }
 
 }  // namespace bookmarks