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

Unified Diff: content/browser/web_contents/navigation_controller_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: Updated comments Created 8 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/browser/web_contents/navigation_controller_impl.cc
diff --git a/content/browser/web_contents/navigation_controller_impl.cc b/content/browser/web_contents/navigation_controller_impl.cc
index b24eb5b1390c3071230174dcd27948bd9c4f3d93..a32654b59fef14a1de560661773e1668d8568499 100644
--- a/content/browser/web_contents/navigation_controller_impl.cc
+++ b/content/browser/web_contents/navigation_controller_impl.cc
@@ -587,6 +587,29 @@ void NavigationControllerImpl::LoadURL(
LoadEntry(entry);
}
+void NavigationControllerImpl::LoadDataWithBaseURL(
+ const GURL& data_url,
+ const content::Referrer& referrer,
+ const GURL& base_url,
+ const GURL& history_url,
+ bool is_overriding_user_agent) {
+ needs_reload_ = false;
+
+ NavigationEntryImpl* entry = NavigationEntryImpl::FromNavigationEntry(
+ CreateNavigationEntry(
+ data_url,
+ referrer,
+ content::PAGE_TRANSITION_TYPED,
+ false,
+ std::string(),
+ browser_context_));
+ entry->SetIsOverridingUserAgent(is_overriding_user_agent);
+ entry->SetBaseURL(base_url);
+ entry->SetVirtualURL(history_url);
+
+ LoadEntry(entry);
+}
+
void NavigationControllerImpl::LoadURLFromRenderer(
const GURL& url,
const content::Referrer& referrer,

Powered by Google App Engine
This is Rietveld 408576698