Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / bookmarks / bookmark_drag_drop.cc

diff --git a/src/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc b/src/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc
index 79e5543..db782f8 100644 (file)
--- a/src/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc
+++ b/src/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc
@@ -15,6 +15,8 @@
 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 
+using bookmarks::BookmarkNodeData;
+
 namespace chrome {
 
 int DropBookmarks(Profile* profile,
@@ -30,8 +32,8 @@ int DropBookmarks(Profile* profile,
     const std::vector<const BookmarkNode*> dragged_nodes =
         data.GetNodes(model, profile->GetPath());
     DCHECK(model->client()->CanBeEditedByUser(parent_node));
-    DCHECK(copy || bookmark_utils::CanAllBeEditedByUser(model->client(),
-                                                        dragged_nodes));
+    DCHECK(copy ||
+           bookmarks::CanAllBeEditedByUser(model->client(), dragged_nodes));
     if (!dragged_nodes.empty()) {
       // Drag from same profile. Copy or move nodes.
       for (size_t i = 0; i < dragged_nodes.size(); ++i) {
@@ -47,8 +49,7 @@ int DropBookmarks(Profile* profile,
     return ui::DragDropTypes::DRAG_NONE;
   }
   // Dropping a folder from different profile. Always accept.
-  bookmark_utils::CloneBookmarkNode(model, data.elements, parent_node,
-                                    index, true);
+  bookmarks::CloneBookmarkNode(model, data.elements, parent_node, index, true);
   return ui::DragDropTypes::DRAG_COPY;
 }