Move the mixed scripting infobar to a page action icon / content setting.

chrome/renderer/content_settings_observer.cc

Index: chrome/renderer/content_settings_observer.cc
===================================================================
--- chrome/renderer/content_settings_observer.cc	(revision 143396)
+++ chrome/renderer/content_settings_observer.cc	(working copy)
@@ -101,7 +101,7 @@
   if (!content_blocked_[settings_type] || !resource_identifier.empty()) {
     content_blocked_[settings_type] = true;
     Send(new ChromeViewHostMsg_ContentBlocked(routing_id(), settings_type,
-                                        resource_identifier));
+                                              resource_identifier));
   }
 }
 
@@ -288,14 +288,18 @@
   return result;
 }
 
-void ContentSettingsObserver::DidNotAllowPlugins(WebFrame* frame) {
+void ContentSettingsObserver::DidNotAllowPlugins() {
   DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, std::string());
 }
 
-void ContentSettingsObserver::DidNotAllowScript(WebFrame* frame) {
+void ContentSettingsObserver::DidNotAllowScript() {
   DidBlockContentType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string());
 }
 
+void ContentSettingsObserver::DidNotAllowMixedScript() {
+  DidBlockContentType(CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, std::string());
+}
+
 void ContentSettingsObserver::OnLoadBlockedPlugins(
     const std::string& identifier) {
   temporarily_allowed_plugins_.insert(identifier);