diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 22:19:43 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 22:19:43 +0000 |
| commit | cc8606576ae7b2b3954785912e283d186b0926e4 (patch) | |
| tree | 39dc16ae8b1fc1922b1e29360a7d7c98d9143ce6 /chrome/renderer | |
| parent | c47ec94ebae969025cb1d6166d3e482293553c95 (diff) | |
| download | chromium_src-cc8606576ae7b2b3954785912e283d186b0926e4.zip chromium_src-cc8606576ae7b2b3954785912e283d186b0926e4.tar.gz chromium_src-cc8606576ae7b2b3954785912e283d186b0926e4.tar.bz2 | |
Remove GetChannel() call from mixed content path. This version is correct
for trunk, with the stricter policy.
BUG=98611
Review URL: http://codereview.chromium.org/8233028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/chrome_render_view_observer.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc index 39dc76d..b6c95f6 100644 --- a/chrome/renderer/chrome_render_view_observer.cc +++ b/chrome/renderer/chrome_render_view_observer.cc @@ -10,7 +10,6 @@ #include "base/string_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/chrome_version_info.h" #include "chrome/common/icon_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/thumbnail_score.h" @@ -535,6 +534,9 @@ bool ChromeRenderViewObserver::allowRunningInsecureContent( bool allowed_per_settings, const WebKit::WebSecurityOrigin& origin, const WebKit::WebURL& url) { + // Single value to control permissive mixed content behaviour. + const bool enforce_insecure_content_on_all_domains = true; + UMA_HISTOGRAM_ENUMERATION(kSSLInsecureContent, INSECURE_CONTENT_RUN, INSECURE_CONTENT_NUM_EVENTS); @@ -630,12 +632,9 @@ bool ChromeRenderViewObserver::allowRunningInsecureContent( if (allow_running_insecure_content_ || allowed_per_settings) return true; - bool enforce_insecure_content_on_all_domains = - (chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_STABLE - || CommandLine::ForCurrentProcess()->HasSwitch( - switches::kNoRunningInsecureContent)); - - if (!enforce_insecure_content_on_all_domains) { + if (!(enforce_insecure_content_on_all_domains || + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kNoRunningInsecureContent))) { bool mandatory_enforcement = (is_google || isHostInDomain(host, kFacebookDotCom) || isHostInDomain(host, kTwitterDotCom)); |