diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 20:32:09 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 20:32:09 +0000 |
| commit | 42cf7cbe78b0bb4f755f5b6e51e2ef229f3586ec (patch) | |
| tree | 6d2187b16e3674b8b219cf164429b5ceb3e54010 /content/browser/loader/cross_site_resource_handler.cc | |
| parent | e795ab6b7d7630292c1671ca615def7e5d3649eb (diff) | |
| download | chromium_src-42cf7cbe78b0bb4f755f5b6e51e2ef229f3586ec.zip chromium_src-42cf7cbe78b0bb4f755f5b6e51e2ef229f3586ec.tar.gz chromium_src-42cf7cbe78b0bb4f755f5b6e51e2ef229f3586ec.tar.bz2 | |
Add base:: qualification to some COmmandLine references in content.
TBR=sky
Review URL: https://codereview.chromium.org/456513002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/cross_site_resource_handler.cc')
| -rw-r--r-- | content/browser/loader/cross_site_resource_handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc index 3d7862f..03589bf 100644 --- a/content/browser/loader/cross_site_resource_handler.cc +++ b/content/browser/loader/cross_site_resource_handler.cc @@ -194,7 +194,8 @@ bool CrossSiteResourceHandler::OnNormalResponseStarted( // or for WebUI processes for now, since pages like the NTP host multiple // cross-site WebUI iframes. if (!should_transfer && - CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess) && + base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kSitePerProcess) && !ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings( info->GetChildID())) { return DeferForNavigationPolicyCheck(info, response, defer); |