content/browser/web_contents/web_contents_impl.cc - Issue 10544175: Add an ability to call WebKit's WebFrame::loadData via NavigationController.

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

Issue 10544175: Add an ability to call WebKit's WebFrame::loadData via NavigationController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Actually removed method decl from NavigationController interface Created 8 years, 5 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

« content/browser/web_contents/navigation_entry_impl.h ('K') | « content/browser/web_contents/navigation_entry_impl.cc ('k') | content/common/view_messages.h » ('j') | content/public/browser/android/navigation_controller_webview.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.cc

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

index 48fdd47b87f63da059310c1759b72c49656a4bf1..71f02d3f5edb0768012628e003eb39239194847a 100644

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

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

@@ -216,6 +216,10 @@ void MakeNavigateParams(const NavigationEntryImpl& entry,

params->current_history_list_offset = controller.GetLastCommittedEntryIndex();

params->current_history_list_length = controller.GetEntryCount();

params->url = entry.GetURL();

+ if (!entry.GetBaseURLForDataURL().is_empty()) {

+ params->base_url_for_data_url = entry.GetBaseURLForDataURL();

+ params->history_url_for_data_url = entry.GetVirtualURL();

+ }

params->referrer = entry.GetReferrer();

params->transition = entry.GetTransitionType();

params->state = entry.GetContentState();