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

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

 // Copyright (c) 2012 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/browser/ui/webui/options2/content_settings_handler2.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 319 matching lines @@
   {CONTENT_SETTINGS_TYPE_IMAGES, "images"},
   {CONTENT_SETTINGS_TYPE_JAVASCRIPT, "javascript"},
   {CONTENT_SETTINGS_TYPE_PLUGINS, "plugins"},
   {CONTENT_SETTINGS_TYPE_POPUPS, "popups"},
   {CONTENT_SETTINGS_TYPE_GEOLOCATION, "location"},
   {CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "notifications"},
   {CONTENT_SETTINGS_TYPE_INTENTS, "intents"},
   {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"},
 };
 
 ContentSettingsHandler::ContentSettingsHandler() {
 }
 
 ContentSettingsHandler::~ContentSettingsHandler() {
 }
 
 void ContentSettingsHandler::GetLocalizedValues(
@@ skipping 312 matching lines @@
   }
 }
 
 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;
 
+  // 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();
       break;
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       UpdateNotificationExceptionsView();
       break;
     case EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC:
       UpdateFlashCameraMicExceptionsView();
       break;
     default:
       UpdateExceptionsViewFromHostContentSettingsMap(
           type.ToContentSettingsType());
       break;
   }
 }
 
 void ContentSettingsHandler::UpdateOTRExceptionsViewFromModel(
     const ExContentSettingsType& type) {
   switch (type) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
     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:
       UpdateExceptionsViewFromOTRHostContentSettingsMap(
           type.ToContentSettingsType());
       break;
   }
 }
 
 void ContentSettingsHandler::UpdateGeolocationExceptionsView() {
@@ skipping 560 matching lines @@
   for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
     if (type == kExContentSettingsTypeGroupNames[i].type)
       return kExContentSettingsTypeGroupNames[i].name;
   }
 
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace options2