content/browser/web_contents/web_contents_view_aura.h - 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/web_contents/web_contents_view_aura.h

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/web_contents/web_contents_view_android.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_view_aura.h

diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h

index 738e28d08d8381ce356164bc3b7c594e2d404220..0ed09ef5c8f3289f1841c3d2724a555ed11a6f79 100644

--- a/content/browser/web_contents/web_contents_view_aura.h

+++ b/content/browser/web_contents/web_contents_view_aura.h

@@ -109,7 +109,7 @@ class CONTENT_EXPORT WebContentsViewAura

virtual void SetInitialFocus() OVERRIDE;

virtual void StoreFocus() OVERRIDE;

virtual void RestoreFocus() OVERRIDE;

- virtual WebDropData* GetDropData() const OVERRIDE;

+ virtual DropData* GetDropData() const OVERRIDE;

virtual gfx::Rect GetViewBounds() const OVERRIDE;

// Overridden from WebContentsViewPort:

@@ -133,7 +133,7 @@ class CONTENT_EXPORT WebContentsViewAura

const std::vector<WebMenuItem>& items,

bool right_aligned,

bool allow_multiple_selection) OVERRIDE;

- virtual void StartDragging(const WebDropData& drop_data,

+ virtual void StartDragging(const DropData& drop_data,

WebKit::WebDragOperationsMask operations,

const gfx::ImageSkia& image,

const gfx::Vector2d& image_offset,

@@ -200,7 +200,7 @@ class CONTENT_EXPORT WebContentsViewAura

WebKit::WebDragOperationsMask current_drag_op_;

- scoped_ptr<WebDropData> current_drop_data_;

+ scoped_ptr<DropData> current_drop_data_;

WebDragDestDelegate* drag_dest_delegate_;