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 176 matching lines @@
     }
   }
 }
 
 void PasteFromClipboard(BookmarkModel* model,
                         const BookmarkNode* parent,
                         int index) {
   if (!parent)
     return;
 
-  BookmarkNodeData bookmark_data;
+  if (BookmarkNodeData::ClipboardContainsBookmarks()) {
+    BookmarkNodeData bookmark_data;
   if (!bookmark_data.ReadFromClipboard(ui::CLIPBOARD_TYPE_COPY_PASTE))

[sky, 2014/08/13 16:48:35]

Fix indentation here.

     return;
 
   if (index == -1)
     index = parent->child_count();
   ScopedGroupBookmarkActions group_paste(model);
   CloneBookmarkNode(model, bookmark_data.elements, parent, index, true);
+  }
+  if (ui::Clipboard::GetForCurrentThread()->IsFormatAvailable(
+          ui::Clipboard::GetUrlWFormatType(), ui::CLIPBOARD_TYPE_COPY_PASTE)) {

[sky, 2014/08/13 16:48:34]

I think this path should convert to a BookmarkNodeData so that you can share the
code for pasting.

+    base::string16 url_text;
+    ui::Clipboard::GetForCurrentThread()->ReadText(
+        ui::CLIPBOARD_TYPE_COPY_PASTE, &url_text);
+    GURL url(url_text);
+    model->AddURL(parent, index, url_text, url);
+  }
 }
 
 bool CanPasteFromClipboard(BookmarkModel* model, const BookmarkNode* node) {
   if (!node || !model->client()->CanBeEditedByUser(node))
     return false;
-  return BookmarkNodeData::ClipboardContainsBookmarks();
+  return BookmarkNodeData::ClipboardContainsBookmarks() ||
+         ui::Clipboard::GetForCurrentThread()->IsFormatAvailable(
+             ui::Clipboard::GetUrlWFormatType(), ui::CLIPBOARD_TYPE_COPY_PASTE);
 }
 
 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