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

chrome/browser/ui/content_settings/content_setting_image_model.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/content_settings/content_setting_image_model.h"
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 35 matching lines @@
 
   virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
 };
 
 const int ContentSettingBlockedImageModel::kBlockedIconIDs[] = {
     IDR_BLOCKED_COOKIES,
     IDR_BLOCKED_IMAGES,
     IDR_BLOCKED_JAVASCRIPT,
     IDR_BLOCKED_PLUGINS,
     IDR_BLOCKED_POPUPS,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    IDR_OMNIBOX_HTTPS_INVALID,

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

Can we stick  some COMPILE_ASSERTS here to catch the lack of sufficient elements
in the future?

[Bernhard Bauer, 2012/06/20 17:01:43]

What we should do here is have a ContentSettingsTypeIdEntry array like in
content_setting_bubble_model, to avoid having to add zeroes for every new
content type.

 };
 
 const int ContentSettingBlockedImageModel::kAccessedIconIDs[] = {
     IDR_ACCESSED_COOKIES,
     0,
     0,
     0,
     0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
 };
 
 const int ContentSettingBlockedImageModel::kBlockedExplanatoryTextIDs[] = {
     0,
     0,
     0,
     0,
     IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
 };
 
 const int ContentSettingBlockedImageModel::kAccessedExplanatoryTextIDs[] = {
     0,
     0,
     0,
     0,
     0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
 };
 
 
 const int ContentSettingBlockedImageModel::kBlockedTooltipIDs[] = {
     IDS_BLOCKED_COOKIES_TITLE,
     IDS_BLOCKED_IMAGES_TITLE,
     IDS_BLOCKED_JAVASCRIPT_TITLE,
     IDS_BLOCKED_PLUGINS_MESSAGE,
     IDS_BLOCKED_POPUPS_TOOLTIP,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT,
 };
 
 const int ContentSettingBlockedImageModel::kAccessedTooltipIDs[] = {
     IDS_ACCESSED_COOKIES_TITLE,
     0,
     0,
     0,
     0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
 };
 
 ContentSettingBlockedImageModel::ContentSettingBlockedImageModel(
     ContentSettingsType content_settings_type)
     : ContentSettingImageModel(content_settings_type) {
 }
 
 void ContentSettingBlockedImageModel::UpdateFromWebContents(
     WebContents* web_contents) {
   set_visible(false);
@@ skipping 79 matching lines @@
     ContentSettingsType content_settings_type) {
   switch (content_settings_type) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       return new ContentSettingGeolocationImageModel();
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       return new ContentSettingNotificationsImageModel();
     default:
       return new ContentSettingBlockedImageModel(content_settings_type);
   }
 }