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

chrome/browser/ui/webui/options2/content_settings_handler2.cc

Index: chrome/browser/ui/webui/options2/content_settings_handler2.cc
===================================================================
--- chrome/browser/ui/webui/options2/content_settings_handler2.cc	(revision 142907)
+++ chrome/browser/ui/webui/options2/content_settings_handler2.cc	(working copy)
@@ -337,6 +337,7 @@
   {CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, "auto-select-certificate"},
   {CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen"},
   {CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock"},
+  {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, "mixed-script"},
   {EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC, "pepper-flash-cameramic"},
 };
 
@@ -669,6 +670,10 @@
   if (type == CONTENT_SETTINGS_TYPE_INTENTS)
     return;
 
+  // We don't yet support exceptions for mixed scripting.
+  if (type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT)

[Tom Sepez, 2012/06/20 04:16:07]

Am I being dense?  Shouldn't these two just be cases in the switch below rather
than separate if-statements?

+    return;
+
   switch (type) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       UpdateGeolocationExceptionsView();
@@ -693,6 +698,7 @@
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
     case CONTENT_SETTINGS_TYPE_INTENTS:
     case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE:
+    case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
     case EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC:
       break;
     default: