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 143396)
+++ 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"},
 };
 
@@ -664,11 +665,6 @@
 
 void ContentSettingsHandler::UpdateExceptionsViewFromModel(
     const ExContentSettingsType& type) {
-  // Don't update intents settings at this point.
-  // Turn on when enable_web_intents_tag is enabled.
-  if (type == CONTENT_SETTINGS_TYPE_INTENTS)
-    return;
-
   switch (type) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       UpdateGeolocationExceptionsView();
@@ -679,6 +675,13 @@
     case EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC:
       UpdateFlashCameraMicExceptionsView();
       break;
+    case CONTENT_SETTINGS_TYPE_INTENTS:
+      // Don't update intents settings at this point.
+      // Turn on when enable_web_intents_tag is enabled.
+      break;
+    case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
+      // We don't yet support exceptions for mixed scripting.
+      break;
     default:
       UpdateExceptionsViewFromHostContentSettingsMap(
           type.ToContentSettingsType());
@@ -693,6 +696,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: