content/renderer/web_ui_bindings.cc - Issue 7242014: Update src/content/renderer to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE

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/renderer/web_ui_bindings.cc

Issue 7242014: Update src/content/renderer to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 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

Index: content/renderer/web_ui_bindings.cc

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

--- content/renderer/web_ui_bindings.cc (revision 90236)

+++ content/renderer/web_ui_bindings.cc (working copy)

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

#include "base/stl_util-inl.h"

#include "base/values.h"

#include "content/common/view_messages.h"

+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"

@@ -81,11 +82,11 @@

content.reset(new ListValue());

}

- // Retrieve the source frame's url

+ // Retrieve the source document's url

GURL source_url;

- WebKit::WebFrame* webframe = WebKit::WebFrame::frameForCurrentContext();

- if (webframe)

- source_url = webframe->url();

+ WebKit::WebFrame* frame = WebKit::WebFrame::frameForCurrentContext();

+ if (frame)

+ source_url = frame->document().url();

// Send the message up to the browser.

sender()->Send(new ViewHostMsg_WebUISend(

« no previous file with comments | « content/renderer/render_view.cc ('k') | content/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »