Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5838)

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

Issue 339503004: Add the extended reporting checkbox to the malware interstitial v3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index df8a9e55d1806d140d1014858c8ee67a4a46902b..f099a7cdd405acda9fccd14634cba5c6c238fa23 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -1309,6 +1309,19 @@ void SafeBrowsingBlockingPageV3::PopulateMalwareLoadTimeData(
load_time_data->SetString(
"finalParagraph",
l10n_util::GetStringUTF16(IDS_MALWARE_V3_PROCEED_PARAGRAPH));
+
+ if (!CanShowMalwareDetailsOption()) return;
Dan Beam 2014/06/16 19:05:50 nit: if () { ... } instead of if (!) return; so pe
felt 2014/06/17 05:41:55 Done.
+ load_time_data->SetBoolean(kDisplayCheckBox, true);
mattm 2014/06/16 21:02:21 is it okay that this is undefined instead of false
felt 2014/06/17 05:41:55 Done.
+ std::string privacy_link = base::StringPrintf(
+ kPrivacyLinkHtml,
+ l10n_util::GetStringUTF8(
+ IDS_SAFE_BROWSING_PRIVACY_POLICY_PAGE_V2).c_str());
+ load_time_data->SetString(
+ "optinText",
+ l10n_util::GetStringFUTF16(IDS_SAFE_BROWSING_MALWARE_V2_REPORTING_AGREE,
+ base::UTF8ToUTF16(privacy_link)));
+ load_time_data->SetBoolean(
+ kBoxChecked, IsPrefEnabled(prefs::kSafeBrowsingReportingEnabled));
mattm 2014/06/16 21:02:21 This should do the migration stuff like 336673002?
felt 2014/06/17 05:41:55 Done now that I could rebase off 336673002.
}
void SafeBrowsingBlockingPageV3::PopulatePhishingLoadTimeData(

Powered by Google App Engine
This is Rietveld 408576698