gtk: Fold bookmark_drag.* into bookmark_drag_drop_gtk.cc

BUG=None TEST=none, no functional changes. R=erg@chromium.org TBR=thestig # for gyp change. Review URL: https://chromiumcodereview.appspot.com/23743003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221962 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Sep 8, 2013 · 417e0ce · 417e0ce
1 parent d4b3878
commit 417e0ce
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 92 deletions.
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_drag.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_drag.cc
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_drag.h b/chrome/browser/ui/gtk/bookmarks/bookmark_drag.h
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_drag_drop_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_drag_drop_gtk.cc
@@ -4,7 +4,46 @@
 
 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"
 
-#include "chrome/browser/ui/gtk/bookmarks/bookmark_drag.h"
+#include <vector>
+
+#include "base/compiler_specific.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/custom_drag.h"
+
+namespace {
+
+const GdkDragAction kBookmarkDragAction =
+    static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE);
+
+// Encapsulates functionality for drags of one or more bookmarks.
+class BookmarkDrag : public CustomDrag {
+ public:
+  BookmarkDrag(Profile* profile, const std::vector<const BookmarkNode*>& nodes);
+
+ private:
+  virtual ~BookmarkDrag() {}
+
+  virtual void OnDragDataGet(GtkWidget* widget,
+                             GdkDragContext* context,
+                             GtkSelectionData* selection_data,
+                             guint target_type,
+                             guint time) OVERRIDE {
+    WriteBookmarksToSelection(nodes_, selection_data, target_type, profile_);
+  }
+
+  Profile* profile_;
+  std::vector<const BookmarkNode*> nodes_;
+
+  DISALLOW_COPY_AND_ASSIGN(BookmarkDrag);
+};
+
+BookmarkDrag::BookmarkDrag(Profile* profile,
+                           const std::vector<const BookmarkNode*>& nodes)
+    : CustomDrag(NULL, GetCodeMask(false), kBookmarkDragAction),
+      profile_(profile),
+      nodes_(nodes) {}
+
+}  // namespace
 
 namespace chrome {
 
@@ -13,7 +52,9 @@ void DragBookmarks(Profile* profile,
                    gfx::NativeView view) {
   DCHECK(!nodes.empty());
 
-  BookmarkDrag::BeginDrag(profile, nodes);
+  // This starts the drag process, the lifetime of this object is tied to the
+  // system drag.
+  new BookmarkDrag(profile, nodes);
 }
 
 }  // namespace chrome
diff --git a/chrome/browser/ui/gtk/download/download_item_drag.cc b/chrome/browser/ui/gtk/download/download_item_drag.cc
@@ -109,11 +109,6 @@ void DownloadItemDrag::SetSource(GtkWidget* widget,
   DragData::AttachToWidget(drag_data.Pass(), widget, icon);
 }
 
-// static
-void DownloadItemDrag::BeginDrag(const DownloadItem* item, gfx::Image* icon) {
-  new DownloadItemDrag(item, icon);
-}
-
 DownloadItemDrag::DownloadItemDrag(const DownloadItem* item, gfx::Image* icon)
     : CustomDrag(icon, kDownloadItemCodeMask, kDownloadItemDragAction),
       drag_data_(new DragData(item)) {}
@@ -131,5 +126,7 @@ void DownloadItemDrag::OnDragDataGet(GtkWidget* widget,
 void DragDownloadItem(const content::DownloadItem* download,
                       gfx::Image* icon,
                       gfx::NativeView view) {
-  DownloadItemDrag::BeginDrag(download, icon);
+  // This starts the drag process, the lifetime of this object is tied to the
+  // system drag.
+  new DownloadItemDrag(download, icon);
 }
diff --git a/chrome/browser/ui/gtk/download/download_item_drag.h b/chrome/browser/ui/gtk/download/download_item_drag.h
@@ -17,21 +17,18 @@ class DownloadItem;
 // Encapsulates functionality for drags of download items.
 class DownloadItemDrag : public CustomDrag {
  public:
+  DownloadItemDrag(const content::DownloadItem* item, gfx::Image* icon);
+
   // Sets |widget| as a source for drags pertaining to |item|. No
   // DownloadItemDrag object is created.
   // It is safe to call this multiple times with different values of |icon|.
   static void SetSource(GtkWidget* widget,
                         const content::DownloadItem* item,
                         gfx::Image* icon);
 
-  // Creates a new DownloadItemDrag, the lifetime of which is tied to the
-  // system drag.
-  static void BeginDrag(const content::DownloadItem* item, gfx::Image* icon);
-
  private:
   class DragData;
 
-  DownloadItemDrag(const content::DownloadItem* item, gfx::Image* icon);
   virtual ~DownloadItemDrag();
 
   virtual void OnDragDataGet(GtkWidget* widget,

diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
@@ -1053,8 +1053,6 @@
         'browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h',
         'browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc',
         'browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h',
-        'browser/ui/gtk/bookmarks/bookmark_drag.cc',
-        'browser/ui/gtk/bookmarks/bookmark_drag.h',
         'browser/ui/gtk/bookmarks/bookmark_drag_drop_gtk.cc',
         'browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc',
         'browser/ui/gtk/bookmarks/bookmark_editor_gtk.h',