content/browser/web_contents/web_drag_source_win.cc - Issue 23618036: Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

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_drag_source_win.cc

Issue 23618036: Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 7 years, 2 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_impl.cc ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_drag_source_win.cc

diff --git a/content/browser/web_contents/web_drag_source_win.cc b/content/browser/web_contents/web_drag_source_win.cc

index 53df4e81725e0984a3f09e7ec496eb022174095f..77dc4c4f27db5d20e5a79d7e0800d3521b5660ef 100644

--- a/content/browser/web_contents/web_drag_source_win.cc

+++ b/content/browser/web_contents/web_drag_source_win.cc

@@ -39,7 +39,7 @@ WebDragSource::WebDragSource(gfx::NativeWindow source_wnd,

web_contents_(static_cast<WebContentsImpl*>(web_contents)),

effect_(DROPEFFECT_NONE),

data_(NULL) {

- registrar_.Add(this, NOTIFICATION_WEB_CONTENTS_SWAPPED,

+ registrar_.Add(this, NOTIFICATION_RENDER_VIEW_HOST_CHANGED,

Source<WebContents>(web_contents));

registrar_.Add(this, NOTIFICATION_WEB_CONTENTS_DISCONNECTED,

Source<WebContents>(web_contents));

@@ -114,7 +114,7 @@ void WebDragSource::OnDragSourceMove() {

void WebDragSource::Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

- if (type == NOTIFICATION_WEB_CONTENTS_SWAPPED) {

+ if (type == NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {

// When the WebContents get swapped, our render view host goes away.

// That's OK, we can continue the drag, we just can't send messages back to

// our drag source.