content/browser/browser_plugin/browser_plugin_guest.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: content/browser/browser_plugin/browser_plugin_guest.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 | « content/browser/browser_plugin/browser_plugin_guest.h ('k') | content/browser/browser_plugin/browser_plugin_host_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_plugin/browser_plugin_guest.cc

diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc

index ada176048604fcd02e775405ed8baba93bee7135..6a46241549aa5a3d2a92170c423975a2799169cf 100644

--- a/content/browser/browser_plugin/browser_plugin_guest.cc

+++ b/content/browser/browser_plugin/browser_plugin_guest.cc

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

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

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

#include "content/public/common/content_switches.h"

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

#include "content/public/common/media_stream_request.h"

#include "content/public/common/result_codes.h"

#include "net/base/net_errors.h"

@@ -46,7 +47,6 @@

#include "third_party/WebKit/public/web/WebCursorInfo.h"

#include "ui/base/keycodes/keyboard_codes.h"

#include "ui/surface/transport_dib.h"

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

#include "webkit/glue/resource_type.h"

#if defined(OS_MACOSX)

@@ -1132,7 +1132,7 @@ void BrowserPluginGuest::OnCompositorFrameACK(

void BrowserPluginGuest::OnDragStatusUpdate(int instance_id,

WebKit::WebDragStatus drag_status,

- const WebDropData& drop_data,

+ const DropData& drop_data,

WebKit::WebDragOperationsMask mask,

const gfx::Point& location) {

RenderViewHost* host = GetWebContents()->GetRenderViewHost();