Fix bug where --allow-running-insecure-content flag doesn't work against google.com sites in stab...

chrome/common/chrome_switches.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 10 matching lines @@
 // On ChromeOS, file:// access is disabled except for certain whitelisted
 // directories. This switch re-enables file:// for testing.
 const char kAllowFileAccess[]               = "allow-file-access";
 
 // Allow non-https URL for background_page for hosted apps.
 const char kAllowHTTPBackgroundPage[]       = "allow-http-background-page";
 
 // Don't block outdated plugins.
 const char kAllowOutdatedPlugins[]          = "allow-outdated-plugins";
 
+// By default, an https page cannot run JavaScript, CSS or plug-ins from http
+// URLs. This provides an override to get the old insecure behavior.
+const char kAllowRunningInsecureContent[]   = "allow-running-insecure-content";
+
 // Allows injecting extensions and user scripts on the extensions
 // gallery site. Normally prevented for security reasons, but can be
 // useful for automation testing of the gallery.
 const char kAllowScriptingGallery[]         = "allow-scripting-gallery";
 
 // Specifies comma separated list of extension ids to grant access to local
 // websocket proxy.
 const char kAllowWebSocketProxy[]           = "allow-websocket-proxy";
 
 // Allow compositing on chrome:// pages.
@@ skipping 693 matching lines @@
 
 // Disable the latest incarnation of the new tab page. Only intended for testing
 // use. For TOUCH_UI, the meaning is inverted (i.e. default is to disable NTP4,
 // and passing the flag will enable it).
 const char kNewTabPage[]                    = "new-tab-page";
 
 // Disables the default browser check. Useful for UI/browser tests where we
 // want to avoid having the default browser info-bar displayed.
 const char kNoDefaultBrowserCheck[]         = "no-default-browser-check";
 
+// By default, an https page can load images, fonts or frames from an http page.
+// This switch overrides this to block this lesser mixed-content problem.
+const char kNoDisplayingInsecureContent[]   = "no-displaying-insecure-content";
+
 // Don't record/playback events when using record & playback.
 const char kNoEvents[]                      = "no-events";
 
 // Disables all experiments set on about:flags. Does not disable about:flags
 // itself. Useful if an experiment makes chrome crash at startup: One can start
 // chrome with --no-experiments, disable the problematic lab at about:flags and
 // then restart chrome without this switch again.
 const char kNoExperiments[]                 = "no-experiments";
 
 // whether or not it's actually the first run. Overrides kFirstRun in case
 // you're for some reason tempted to pass them both.
 const char kNoFirstRun[]                    = "no-first-run";
 
 // Don't send hyperlink auditing pings
 const char kNoPings[]                       = "no-pings";
 
 // Don't use a proxy server, always make direct connections. Overrides any
 // other proxy server flags that are passed.
 const char kNoProxyServer[]                 = "no-proxy-server";
 
+// Stronger version of insecure content blocking, for the case where the
+// blocking would only be applied to a whitelist of domains.  Switch is
+// expected to become obsolete once the whitelist goes away.
+const char kNoRunningInsecureContent[]      = "no-running-insecure-content";
+
 // Disables the service process from adding itself as an autorun process. This
 // does not delete existing autorun registrations, it just prevents the service
 // from registering a new one.
 const char kNoServiceAutorun[]               = "no-service-autorun";
 
 // Does not automatically open a browser window on startup (used when launching
 // Chrome for the purpose of hosting background apps).
 const char kNoStartupWindow[]               = "no-startup-window";
 
 // Show a desktop notification that the cloud print token has expired and
@@ skipping 466 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead,
 // please put them in alphabetical order above, or in order inside the
 // appropriate ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches