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

chrome/browser/ui/content_settings/content_setting_image_model.cc

Index: chrome/browser/ui/content_settings/content_setting_image_model.cc
===================================================================
--- chrome/browser/ui/content_settings/content_setting_image_model.cc	(revision 142907)
+++ chrome/browser/ui/content_settings/content_setting_image_model.cc	(working copy)
@@ -53,6 +53,13 @@
     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[] = {
@@ -61,6 +68,13 @@
     0,
     0,
     0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
 };
 
 const int ContentSettingBlockedImageModel::kBlockedExplanatoryTextIDs[] = {
@@ -69,6 +83,13 @@
     0,
     0,
     IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
 };
 
 const int ContentSettingBlockedImageModel::kAccessedExplanatoryTextIDs[] = {
@@ -77,6 +98,13 @@
     0,
     0,
     0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
 };
 
 
@@ -86,6 +114,13 @@
     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[] = {
@@ -94,6 +129,13 @@
     0,
     0,
     0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
 };
 
 ContentSettingBlockedImageModel::ContentSettingBlockedImageModel(