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

Unified Diff: chrome/browser/ui/gtk/browser_toolbar_gtk.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/bookmark_utils_gtk_unittest.cc ('k') | chrome/browser/ui/gtk/custom_drag.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/browser_toolbar_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/browser_toolbar_gtk.cc (revision 71798)
+++ chrome/browser/ui/gtk/browser_toolbar_gtk.cc (working copy)
@@ -8,7 +8,6 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "app/gtk_dnd_util.h"
#include "app/l10n_util.h"
#include "base/base_paths.h"
#include "base/command_line.h"
@@ -52,6 +51,7 @@
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
+#include "ui/base/dragdrop/gtk_dnd_util.h"
#include "ui/base/models/accelerator_gtk.h"
namespace {
@@ -421,9 +421,8 @@
if (enable) {
gtk_drag_dest_set(home_->widget(), GTK_DEST_DEFAULT_ALL,
NULL, 0, GDK_ACTION_COPY);
- static const int targets[] = { gtk_dnd_util::TEXT_PLAIN,
- gtk_dnd_util::TEXT_URI_LIST, -1 };
- gtk_dnd_util::SetDestTargetList(home_->widget(), targets);
+ static const int targets[] = { ui::TEXT_PLAIN, ui::TEXT_URI_LIST, -1 };
+ ui::SetDestTargetList(home_->widget(), targets);
drop_handler_.reset(new GtkSignalRegistrar());
drop_handler_->Connect(home_->widget(), "drag-data-received",
@@ -599,7 +598,7 @@
void BrowserToolbarGtk::OnDragDataReceived(GtkWidget* widget,
GdkDragContext* drag_context, gint x, gint y,
GtkSelectionData* data, guint info, guint time) {
- if (info != gtk_dnd_util::TEXT_PLAIN) {
+ if (info != ui::TEXT_PLAIN) {
NOTIMPLEMENTED() << "Only support plain text drops for now, sorry!";
return;
}
« no previous file with comments | « chrome/browser/ui/gtk/bookmark_utils_gtk_unittest.cc ('k') | chrome/browser/ui/gtk/custom_drag.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698