diff options
| author | hush@chromium.org <hush@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 17:58:08 +0000 |
|---|---|---|
| committer | hush@chromium.org <hush@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 17:58:08 +0000 |
| commit | 76bdecb0a76e2ee8678db5340aebad0b616419e2 (patch) | |
| tree | 370df0ba0a7bc0bdb054c697c918f0e045a5b4c1 /content/shell/browser/shell.cc | |
| parent | 3e3f28f5d0685810d3dff40a4e9e72ec2748b5dd (diff) | |
| download | chromium_src-76bdecb0a76e2ee8678db5340aebad0b616419e2.zip chromium_src-76bdecb0a76e2ee8678db5340aebad0b616419e2.tar.gz chromium_src-76bdecb0a76e2ee8678db5340aebad0b616419e2.tar.bz2 | |
Set the original url correctly if the frame is loaded via loadData
BUG=348234
Review URL: https://codereview.chromium.org/176883012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/browser/shell.cc')
| -rw-r--r-- | content/shell/browser/shell.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc index b19ad1f..027e611 100644 --- a/content/shell/browser/shell.cc +++ b/content/shell/browser/shell.cc @@ -179,6 +179,18 @@ void Shell::LoadURLForFrame(const GURL& url, const std::string& frame_name) { web_contents_->GetView()->Focus(); } +void Shell::LoadDataWithBaseURL(const GURL& url, const std::string& data, + const GURL& base_url) { + const GURL data_url = GURL("data:text/html;charset=utf-8," + data); + NavigationController::LoadURLParams params(data_url); + params.load_type = NavigationController::LOAD_TYPE_DATA; + params.base_url_for_data_url = base_url; + params.virtual_url_for_data_url = url; + params.override_user_agent = NavigationController::UA_OVERRIDE_FALSE; + web_contents_->GetController().LoadURLWithParams(params); + web_contents_->GetView()->Focus(); +} + void Shell::AddNewContents(WebContents* source, WebContents* new_contents, WindowOpenDisposition disposition, |