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

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
===================================================================
--- chrome/browser/ui/browser.cc	(revision 142907)
+++ chrome/browser/ui/browser.cc	(working copy)
@@ -236,6 +236,11 @@
 // The URL for the privacy dashboard.
 const char kPrivacyDashboardUrl[] = "https://www.google.com/dashboard";
 
+// The URL for when the user clicks "learn more" on the mixed scripting page
+// icon bubble.
+const char kInsecureContentHelpUrl[] =
+    "https://support.google.com/chrome/bin/answer.py?hl=en-US&answer=1342714";

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

Please don't hardcode this to an english Help Center article. There is a method
google_util::AppendGoogleLocaleParam() that you can use.

+
 // How long we wait before updating the browser chrome while loading a page.
 const int kUIUpdateCoalescingTimeMS = 200;
 
@@ -1937,10 +1942,18 @@
 }
 
 void Browser::ShowContentSettingsPage(ContentSettingsType content_type) {
-  ShowOptionsTab(
-      chrome::kContentSettingsExceptionsSubPage + std::string(kHashMark) +
-      options2::ContentSettingsHandler::ContentSettingsTypeToGroupName(
-          content_type));
+  if (content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) {
+    // We don't (yet?) implment user-settable exceptions for mixed script

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

nit: implement

+    // loading, so bounce to an explanatory page for now.

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

nit: exceptions are for blocking not loading, eh?  since default is block?

+    OpenURL(OpenURLParams(
+      GURL(kInsecureContentHelpUrl), Referrer(),

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

Are we sure we want to send a referrer here?   SSL page to other domain (Gs) ssl
page?

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

I think this sends an empty referrer.

+      NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
+  } else {
+    ShowOptionsTab(
+        chrome::kContentSettingsExceptionsSubPage + std::string(kHashMark) +
+        options2::ContentSettingsHandler::ContentSettingsTypeToGroupName(
+            content_type));
+  }
 }
 
 void Browser::OpenClearBrowsingDataDialog() {