Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3042)

Unified Diff: chrome/browser/ui/gtk/custom_drag.cc

Issue 6250014: Move more dnd related files to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/custom_drag.cc
===================================================================
--- chrome/browser/ui/gtk/custom_drag.cc (revision 71798)
+++ chrome/browser/ui/gtk/custom_drag.cc (working copy)
@@ -4,7 +4,6 @@
#include "chrome/browser/gtk/custom_drag.h"
-#include "app/gtk_dnd_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/download/download_item.h"
#include "chrome/browser/gtk/bookmark_utils_gtk.h"
@@ -12,11 +11,11 @@
#include "googleurl/src/gurl.h"
#include "net/base/net_util.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/dragdrop/gtk_dnd_util.h"
namespace {
-const int kDownloadItemCodeMask = gtk_dnd_util::TEXT_URI_LIST |
- gtk_dnd_util::CHROME_NAMED_URL;
+const int kDownloadItemCodeMask = ui::TEXT_URI_LIST | ui::CHROME_NAMED_URL;
const GdkDragAction kDownloadItemDragAction = GDK_ACTION_COPY;
const GdkDragAction kBookmarkDragAction =
static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE);
@@ -25,7 +24,7 @@
guint target_type,
const DownloadItem* download_item) {
GURL url = net::FilePathToFileURL(download_item->full_path());
- gtk_dnd_util::WriteURLWithName(selection_data, url,
+ ui::WriteURLWithName(selection_data, url,
UTF8ToUTF16(download_item->GetFileNameToReportUser().value()),
target_type);
}
@@ -51,7 +50,7 @@
g_signal_connect(drag_widget_, "drag-end",
G_CALLBACK(OnDragEndThunk), this);
- GtkTargetList* list = gtk_dnd_util::GetTargetListFromCodeMask(code_mask);
+ GtkTargetList* list = ui::GetTargetListFromCodeMask(code_mask);
GdkEvent* event = gtk_get_current_event();
gtk_drag_begin(drag_widget_, list, action, 1, event);
if (event)
@@ -98,7 +97,7 @@
SkBitmap* icon) {
gtk_drag_source_set(widget, GDK_BUTTON1_MASK, NULL, 0,
kDownloadItemDragAction);
- gtk_dnd_util::SetSourceTargetListFromCodeMask(widget, kDownloadItemCodeMask);
+ ui::SetSourceTargetListFromCodeMask(widget, kDownloadItemCodeMask);
// Disconnect previous signal handlers, if any.
g_signal_handlers_disconnect_by_func(
« no previous file with comments | « chrome/browser/ui/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698