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

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 218 matching lines @@
 namespace {
 
 // The URL to be loaded to display the "Report a broken page" form.
 const char kBrokenPageUrl[] =
     "https://www.google.com/support/chrome/bin/request.py?contact_type="
     "broken_website&format=inproduct&p.page_title=$1&p.page_url=$2";
 
 // 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;
 
 const char kHashMark[] = "#";
 
 // Returns |true| if entry has an internal chrome:// URL, |false| otherwise.
 bool HasInternalURL(const NavigationEntry* entry) {
   if (!entry)
     return false;
 
@@ skipping 1681 matching lines @@
         sub_page.substr(loc) : std::string();
     url = std::string(chrome::kChromeUISettingsURL) + network_page;
   }
 #endif
   browser::NavigateParams params(GetSingletonTabNavigateParams(GURL(url)));
   params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(params);
 }
 
 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() {
   content::RecordAction(UserMetricsAction("ClearBrowsingData_ShowDlg"));
   ShowOptionsTab(chrome::kClearBrowserDataSubPage);
 }
 
 void Browser::OpenOptionsDialog() {
   content::RecordAction(UserMetricsAction("ShowOptions"));
   ShowOptionsTab(std::string());
@@ skipping 3276 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }