Add a link to the safe browsing privacy policies in the option to send malwar...

chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

 // Copyright (c) 2010 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.
 //
 // Implementation of the SafeBrowsingBlockingPage class.
 
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 
 #include <string>
 
@@ skipping 41 matching lines @@
 
 // URL for the "Learn more" link on the multi threat malware blocking page.
 static const char* const kLearnMoreMalwareUrl =
     "http://www.google.com/support/bin/answer.py?answer=45449&topic=360"
     "&sa=X&oi=malwarewarninglink&resnum=1&ct=help";
 
 // URL for the "Learn more" link on the phishing blocking page.
 static const char* const kLearnMorePhishingUrl =
     "http://www.google.com/support/bin/answer.py?answer=106318";
 
+// URL for the "Safe Browsing Privacy Policies" link on the blocking page.
+static const char* const kSbPrivacyPolicyUrl =
+    "http://www.google.com/intl/en_us/privacy/browsing.html";
+
 static const char* const kSbDiagnosticHtml =
     "<a href=\"\" onclick=\"sendCommand('showDiagnostic'); return false;\" "
     "onmousedown=\"return false;\">%s</a>";
 
 static const char* const kPLinkHtml =
     "<a href=\"\" onclick=\"sendCommand('proceed'); return false;\" "
     "onmousedown=\"return false;\">%s</a>";
 
+static const char* const kPrivacyLinkHtml =
+    "<a href=\"\" onclick=\"sendCommand('showPrivacy'); return false;\" "
+    "onmousedown=\"return false;\">%s</a>";
+
 // The commands returned by the page when the user performs an action.
 static const char* const kShowDiagnosticCommand = "showDiagnostic";
 static const char* const kReportErrorCommand = "reportError";
 static const char* const kLearnMoreCommand = "learnMore";
+static const char* const kShowPrivacyCommand = "showPrivacy";
 static const char* const kProceedCommand = "proceed";
 static const char* const kTakeMeBackCommand = "takeMeBack";
 static const char* const kDoReportCommand = "doReport";
 static const char* const kDontReportCommand = "dontReport";
 static const char* const kDisplayCheckBox = "displaycheckbox";
 static const char* const kBoxChecked = "boxchecked";
 
 // static
 SafeBrowsingBlockingPageFactory* SafeBrowsingBlockingPage::factory_ = NULL;
 
@@ skipping 236 matching lines @@
       l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_MALWARE_BACK_BUTTON));
   strings->SetString("proceed_link",
       l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_MALWARE_PROCEED_LINK));
   strings->SetString("textdirection", base::i18n::IsRTL() ? "rtl" : "ltr");
 
   if (!CanShowMalwareDetailsOption()) {
     strings->SetBoolean(kDisplayCheckBox, false);
   } else {
     // Show the checkbox for sending malware details.
     strings->SetBoolean(kDisplayCheckBox, true);
-    strings->SetString(
-        "confirm_text",
-        l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_MALWARE_REPORTING_AGREE));
+
+    std::string privacy_link = StringPrintf(
+        kPrivacyLinkHtml,
+        l10n_util::GetStringUTF8(
+            IDS_SAFE_BROWSING_PRIVACY_POLICY_PAGE).c_str());
+
+    strings->SetString("confirm_text",
+                       l10n_util::GetStringFUTF16(
+                           IDS_SAFE_BROWSING_MALWARE_REPORTING_AGREE,
+                           UTF8ToUTF16(privacy_link)));
 
     const PrefService::Preference* pref =
         tab()->profile()->GetPrefs()->FindPreference(
             prefs::kSafeBrowsingReportingEnabled);
 
     bool value;
     if (pref && pref->GetValue()->GetAsBoolean(&value) && value) {
       strings->SetString(kBoxChecked, "yes");
     } else {
       strings->SetString(kBoxChecked, "");
@@ skipping 50 matching lines @@
     } else if (unsafe_resources_[0].threat_type ==
                SafeBrowsingService::URL_PHISHING) {
       url = google_util::AppendGoogleLocaleParam(GURL(kLearnMorePhishingUrl));
     } else {
       NOTREACHED();
     }
     tab()->OpenURL(url, GURL(), CURRENT_TAB, PageTransition::LINK);
     return;
   }
 
+  if (command == kShowPrivacyCommand) {
+    // User pressed "Safe Browsing privacy policy".
+    GURL url(kSbPrivacyPolicyUrl);  // Note: this page is not yet localized.

[lzheng, 2011/01/13 17:49:35]

Put this note at where kSbPrivacyPolicyUrl is defined. What's the plan to
localize that page? How to direct chrome to a localized link?

[panayiotis, 2011/01/13 18:56:29]

Done. I'll ping Ian on the localization plan. Localized links can be generated
with google_util::AppendGoogleLocaleParam as in line 411. 

+    tab()->OpenURL(url, GURL(), CURRENT_TAB, PageTransition::LINK);
+    return;
+  }
+
   if (command == kProceedCommand) {
     Proceed();
     // We are deleted after this.
     return;
   }
 
   if (command == kTakeMeBackCommand) {
     DontProceed();
     // We are deleted after this.
     return;
@@ skipping 232 matching lines @@
   UnsafeResourceMap* unsafe_resource_map = GetUnsafeResourcesMap();
   (*unsafe_resource_map)[tab_contents].push_back(unsafe_resource);
 }
 
 // static
 bool SafeBrowsingBlockingPage::IsMainPage(
     const UnsafeResourceList& unsafe_resources) {
   return unsafe_resources.size() == 1 &&
          unsafe_resources[0].resource_type == ResourceType::MAIN_FRAME;
 }