chrome/browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc - Issue 18281002: Move WebDropData to content::DropData and split off conversion function.

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/views/tab_contents/web_drag_bookmark_handler_win.cc

Issue 18281002: Move WebDropData to content::DropData and split off conversion function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Mac build error. Created 7 years, 6 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/views/tab_contents/web_drag_bookmark_handler_win.h ('k') | chrome/browser/ui/webui/extensions/install_extension_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc

diff --git a/chrome/browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc b/chrome/browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc

index d63d1b5d8df51d8a15f83e2079cf7594032b003c..474235bd9298f4378b4f5a66c245039d6ff071ab 100644

--- a/chrome/browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc

+++ b/chrome/browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc

@@ -12,9 +12,9 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/url_constants.h"

#include "content/public/browser/web_contents.h"

+#include "content/public/common/drop_data.h"

#include "ui/base/dragdrop/os_exchange_data.h"

#include "ui/base/dragdrop/os_exchange_data_provider_win.h"

-#include "webkit/common/webdropdata.h"

using content::WebContents;

@@ -92,7 +92,7 @@ void WebDragBookmarkHandlerWin::OnDragLeave(IDataObject* data_object) {

}

-bool WebDragBookmarkHandlerWin::AddDragData(const WebDropData& drop_data,

+bool WebDragBookmarkHandlerWin::AddDragData(const content::DropData& drop_data,

ui::OSExchangeData* data) {

if (!drop_data.url.SchemeIs(chrome::kJavaScriptScheme))

return false;