chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc - Issue 6250014: Move more dnd related files to ui/base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/bookmark_menu_controller_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:

Index: chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc

===================================================================

--- chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc (revision 71798)

+++ chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc (working copy)

@@ -6,7 +6,6 @@

#include <gtk/gtk.h>

-#include "app/gtk_dnd_util.h"

#include "app/l10n_util.h"

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

@@ -23,6 +22,7 @@

#include "grit/app_resources.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

+#include "ui/base/dragdrop/gtk_dnd_util.h"

#include "webkit/glue/window_open_disposition.h"

namespace {

@@ -178,10 +178,10 @@

gtk_drag_source_set(menu_item, GDK_BUTTON1_MASK, NULL, 0,

static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_LINK));

- int target_mask = gtk_dnd_util::CHROME_BOOKMARK_ITEM;

+ int target_mask = ui::CHROME_BOOKMARK_ITEM;

if (node->is_url())

- target_mask |= gtk_dnd_util::TEXT_URI_LIST | gtk_dnd_util::NETSCAPE_URL;

- gtk_dnd_util::SetSourceTargetListFromCodeMask(menu_item, target_mask);

+ target_mask |= ui::TEXT_URI_LIST | ui::NETSCAPE_URL;

+ ui::SetSourceTargetListFromCodeMask(menu_item, target_mask);

signals_.Connect(menu_item, "drag-begin",

G_CALLBACK(OnMenuItemDragBeginThunk), this);

signals_.Connect(menu_item, "drag-end",