content/browser/android/web_contents_observer_proxy.cc - Issue 1449793002: data_with_base_url

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/android/web_contents_observer_proxy.cc

Issue 1449793002: data_with_base_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix tests Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/android/web_contents_observer_proxy.cc

diff --git a/content/browser/android/web_contents_observer_proxy.cc b/content/browser/android/web_contents_observer_proxy.cc

index 923f5a6bdd3c27d05f1ec57bed63c755a4a6a1fd..abf471487af0de76a296d66d0dac51716a16ce65 100644

--- a/content/browser/android/web_contents_observer_proxy.cc

+++ b/content/browser/android/web_contents_observer_proxy.cc

@@ -303,8 +303,8 @@ void WebContentsObserverProxy::SetToBaseURLForDataURLIfNeeded(

NavigationEntry* entry =

web_contents()->GetController().GetLastCommittedEntry();

// Note that GetBaseURLForDataURL is only used by the Android WebView.

- if (entry && !entry->GetBaseURLForDataURL().is_empty())

- *url = entry->GetBaseURLForDataURL().possibly_invalid_spec();

+ if (entry && !entry->GetDataURLWithBaseURL().is_empty())

+ *url = entry->GetURL().possibly_invalid_spec();

}

bool RegisterWebContentsObserverProxy(JNIEnv* env) {