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

Unified Diff: chrome/browser/ui/gtk/tabs/tab_strip_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/tabs/tab_gtk.cc ('k') | chrome/browser/ui/views/bookmark_bar_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc (revision 71798)
+++ chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc (working copy)
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "app/gtk_dnd_util.h"
#include "app/resource_bundle.h"
#include "base/i18n/rtl.h"
#include "base/string_util.h"
@@ -34,6 +33,7 @@
#include "grit/theme_resources.h"
#include "ui/base/animation/animation_delegate.h"
#include "ui/base/animation/slide_animation.h"
+#include "ui/base/dragdrop/gtk_dnd_util.h"
namespace {
@@ -738,11 +738,11 @@
NULL, 0,
static_cast<GdkDragAction>(
GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK));
- static const int targets[] = { gtk_dnd_util::TEXT_URI_LIST,
- gtk_dnd_util::NETSCAPE_URL,
- gtk_dnd_util::TEXT_PLAIN,
+ static const int targets[] = { ui::TEXT_URI_LIST,
+ ui::NETSCAPE_URL,
+ ui::TEXT_PLAIN,
-1 };
- gtk_dnd_util::SetDestTargetList(tabstrip_.get(), targets);
+ ui::SetDestTargetList(tabstrip_.get(), targets);
g_signal_connect(tabstrip_.get(), "expose-event",
G_CALLBACK(OnExposeThunk), this);
@@ -1976,10 +1976,10 @@
guint info, guint time) {
bool success = false;
- if (info == gtk_dnd_util::TEXT_URI_LIST ||
- info == gtk_dnd_util::NETSCAPE_URL ||
- info == gtk_dnd_util::TEXT_PLAIN) {
- success = CompleteDrop(data->data, info == gtk_dnd_util::TEXT_PLAIN);
+ if (info == ui::TEXT_URI_LIST ||
+ info == ui::NETSCAPE_URL ||
+ info == ui::TEXT_PLAIN) {
+ success = CompleteDrop(data->data, info == ui::TEXT_PLAIN);
}
gtk_drag_finish(context, success, success, time);
« no previous file with comments | « chrome/browser/ui/gtk/tabs/tab_gtk.cc ('k') | chrome/browser/ui/views/bookmark_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698