Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: extensions/browser/guest_view/web_view/web_view_guest.cc

Issue 1304373007: Browser test for LoadDataWithBaseURL reload (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/guest_view/web_view/web_view_guest.cc
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index 1715b356a363013192047e06722e49e5b5773ff9..ce1d3d573ad4457750fec21aebe96110399aa7d7 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -789,7 +789,9 @@ void WebViewGuest::DidCommitProvisionalLoadForFrame(
const GURL& url,
ui::PageTransition transition_type) {
if (!render_frame_host->GetParent()) {
- src_ = url;
+ // For LoadDataWithBaseURL loads, |url| contains the data URL, but the
+ // virtual URL is needed in that case. So use WebContents::GetURL instead.
+ src_ = web_contents()->GetURL();
// Handle a pending zoom if one exists.
if (pending_zoom_factor_) {
SetZoom(pending_zoom_factor_);
@@ -797,7 +799,7 @@ void WebViewGuest::DidCommitProvisionalLoadForFrame(
}
}
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
- args->SetString(guest_view::kUrl, url.spec());
+ args->SetString(guest_view::kUrl, src_.spec());
args->SetBoolean(guest_view::kIsTopLevel, !render_frame_host->GetParent());
args->SetString(webview::kInternalBaseURLForDataURL,
web_contents()
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698