GTK: Make bookmarks droped from different profiles copy the bookmark.

chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 24 matching lines @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
@@ skipping 1211 matching lines @@
   } else {
     index = GetToolbarIndexForDragOverFolder(widget, x);
     if (index < 0) {
       dest_node = GetNodeForToolButton(widget);
       index = dest_node->child_count();
     }
   }
 
   switch (target_type) {
     case ui::CHROME_BOOKMARK_ITEM: {
-      std::vector<const BookmarkNode*> nodes =
-          bookmark_utils::GetNodesFromSelection(context, selection_data,
-                                                target_type,
-                                                browser_->profile(),
-                                                &delete_selection_data,
-                                                &dnd_success);
-      DCHECK(!nodes.empty());
-      for (std::vector<const BookmarkNode*>::iterator it = nodes.begin();
-           it != nodes.end(); ++it) {
-        model_->Move(*it, dest_node, index);
-        index = dest_node->GetIndexOf(*it) + 1;
-      }
+      Pickle pickle(reinterpret_cast<char*>(selection_data->data),
+                    selection_data->length);
+      BookmarkNodeData drag_data;
+      DCHECK(drag_data.ReadFromPickle(&pickle));
+      dnd_success = bookmark_utils::PerformBookmarkDrop(
+          browser_->profile(),
+          drag_data,
+          dest_node,
+          index) != ui::DragDropTypes::DRAG_NONE;
       break;
     }
 
     case ui::CHROME_NAMED_URL: {
       dnd_success = bookmark_utils::CreateNewBookmarkFromNamedUrl(
           selection_data, model_, dest_node, index);
       break;
     }
 
     case ui::TEXT_URI_LIST: {
@@ skipping 140 matching lines @@
 void BookmarkBarGtk::OnEditBookmarksEnabledChanged() {
   GtkDestDefaults dest_defaults =
       *edit_bookmarks_enabled_ ? GTK_DEST_DEFAULT_ALL :
                                  GTK_DEST_DEFAULT_DROP;
   gtk_drag_dest_set(overflow_button_, dest_defaults, NULL, 0, kDragAction);
   gtk_drag_dest_set(other_bookmarks_button_, dest_defaults,
                     NULL, 0, kDragAction);
   ui::SetDestTargetList(overflow_button_, kDestTargetList);
   ui::SetDestTargetList(other_bookmarks_button_, kDestTargetList);
 }