Skip to content

GitLab

T
tangled
Commit 57630a24 authored by Jialiu Lin's avatar Jialiu Lin Committed by Commit Bot
Browse files
Options

Update Extended Reporting opt-in strings for unity. 

1. Change IDS_SAFE_BROWSING_SCOUT_REPORTING_TITLE and
  IDS_SAFE_BROWSING_SCOUT_REPORTING_SUMMARY in android_chrome_strings.grd
  to match unified consent strings
2. Update IDS_FEEDBACK_SERVICE_DIALOG_EXPLANATION_SCOUT to match unified
  consent string, and move it from google_chrome_strings.grd and
  chromium_trings.grd to generated_resources.grd.
3. set localized "safeBrowsingEnableExtendedReporting" and
  "safeBrowsingEnableExtendedReportingDesc" to unified consent strings
  unconditionally.

Bug: 837857
Change-Id: If659d187c5fd3a4a587c090997b2db8db9127e57
Reviewed-on: https://chromium-review.googlesource.com/1097556
Commit-Queue: Jialiu Lin <jialiul@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarTheresa <twellington@chromium.org>
Reviewed-by: default avatarNathan Parker <nparker@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566683}
parent a605b4f7
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 30 deletions
chrome/android/java/strings/android_chrome_strings.grd
View file @ 57630a24
......@@ -603,11 +603,11 @@ CHAR-LIMIT guidelines:
<message name="IDS_SAFE_BROWSING_EXTENDED_REPORTING_SUMMARY" desc="Summary for report security incidents.">
Automatically report details of possible security incidents to Google
</message>
<message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_TITLE" desc="Title for checkbox that controls reporting data to detect bad apps/sites.">
Security reports
<message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_TITLE" desc="Title for checkbox that controls reporting data to detect bad apps/sites. Please ensure ‘Safe Browsing’ in this message matches the ‘Safe Browsing’ settings title.">
Help improve Safe Browsing
</message>
<message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_SUMMARY" desc="Summary for reporting data to detect bad apps/sites.">
Automatically send some system information and page content to Google to help detect dangerous apps and sites
<message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_SUMMARY" desc="Body text for Chrome setting under 'Help Improve Safe Browsing'. This feature sends small amounts of data to Google about potentially-dangerous pages to help Safe Browsing improve Chrome's protection against malware and phishing.">
Sends some system information and page content to Google
</message>
<message name="IDS_SAFE_BROWSING_TITLE" desc="Title for safe browsing.">
Safe Browsing
......
chrome/app/chromium_strings.grd
View file @ 57630a24
......@@ -1051,9 +1051,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
<message name="IDS_FEEDBACK_SERVICE_DIALOG_EXPLANATION" desc="Explanation of the dialog asking whether the user wants to upload suspected malicious files for analysis">
You can help make Chromium safer and easier to use by automatically reporting details of possible security incidents to Google.
</message>
<message name="IDS_FEEDBACK_SERVICE_DIALOG_EXPLANATION_SCOUT" desc="Explanation of the dialog asking whether the user wants to upload some system information and page content for Safe Browsing analysis">
You can help make Chromium safer and easier to use by automatically sending some system information and page content to Google to help detect dangerous apps and sites.
</message>
<!-- Desktop Capture -->
<message name="IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_TAB" desc="Text for the button on the window picker dialog, clicking which takes one to tab sharing">
......
chrome/app/generated_resources.grd
View file @ 57630a24
......@@ -1904,6 +1904,9 @@ are declared in build/common.gypi.
</if>
<!-- Dialog that asks whether user wants to participate in Safe Browsing Extended Reporting -->
<message name="IDS_FEEDBACK_SERVICE_DIALOG_EXPLANATION_SCOUT" desc="Explanation of the dialog asking whether the user wants to upload some system information and page content for Safe Browsing analysis">
You can help improve Safe Browsing by sending some system information and page content to Google.
</message>
<message name="IDS_FEEDBACK_SERVICE_DIALOG_OK_BUTTON_LABEL" desc="Button that elects to upload suspected malicious files for analysis">
Yes, I want to help
</message>
......
chrome/app/google_chrome_strings.grd
View file @ 57630a24
......@@ -1069,9 +1069,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
<message name="IDS_FEEDBACK_SERVICE_DIALOG_EXPLANATION" desc="Explanation of the dialog asking whether the user wants to upload suspected malicious files for analysis">
You can help make Chrome safer and easier to use by automatically reporting details of possible security incidents to Google.
</message>
<message name="IDS_FEEDBACK_SERVICE_DIALOG_EXPLANATION_SCOUT" desc="Explanation of the dialog asking whether the user wants to upload some system information and page content for Safe Browsing analysis">
You can help make Chrome safer and easier to use by automatically sending some system information and page content to Google to help detect dangerous apps and sites.
</message>
<!-- Desktop Capture -->
<message name="IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_TAB" desc="Text for the button on the window picker dialog, clicking which takes one to tab sharing">
......
chrome/app/settings_strings.grdp
View file @ 57630a24
......@@ -2385,13 +2385,7 @@
<message name="IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC_UNIFIED_CONSENT" desc="The secondary label of the 'Protect you and your device from dangerous sites' checkbox">
Checks sites you visit and files you download for harmful behavior or content, like phishing or malware
</message>
<message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING" desc="Checkbox label: should Chrome upload information about suspicious downloads and websites to Safe Browsing">
Automatically report details of possible security incidents to Google
</message>
<message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_SCOUT_REPORTING" desc="Checkbox label: should Chrome upload some system information and page content to Safe Browsing for malware detection">
Automatically send some system information and page content to Google to help detect dangerous apps and sites
</message>
<message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_UNIFIED_CONSENT" desc="Checkbox label: should Chrome upload some system information and page content to Safe Browsing">
<message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_UNIFIED_CONSENT" desc="The section title of the 'Sends some system information and page content to Google' checkbox">
Help improve Safe Browsing
</message>
<message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC_UNIFIED_CONSENT" desc="Checkbox label: should Chrome upload some system information and page content to Safe Browsing">
......
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
View file @ 57630a24
......@@ -1880,6 +1880,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
{"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
{"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
{"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
{"safeBrowsingEnableExtendedReporting",
IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_UNIFIED_CONSENT},
{"safeBrowsingEnableExtendedReportingDesc",
IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC_UNIFIED_CONSENT},
{"syncAndPersonalizationLink", IDS_SETTINGS_PRIVACY_MORE_SETTINGS},
};
AddLocalizedStringsBulk(html_source, localized_strings,
......@@ -1892,10 +1896,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
{"searchSuggestPref", IDS_SETTINGS_SUGGEST_PREF_UNIFIED_CONSENT},
{"searchSuggestPrefDesc",
IDS_SETTINGS_SUGGEST_PREF_DESC_UNIFIED_CONSENT},
{"safeBrowsingEnableExtendedReporting",
IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_UNIFIED_CONSENT},
{"safeBrowsingEnableExtendedReportingDesc",
IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC_UNIFIED_CONSENT},
{"networkPredictionEnabled",
IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_LABEL_UNIFIED_CONSENT},
{"networkPredictionEnabledDesc",
......@@ -1919,7 +1919,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
LocalizedString conditional_localized_strings[] = {
{"searchSuggestPref", IDS_SETTINGS_SUGGEST_PREF},
{"searchSuggestPrefDesc", IDS_SETTINGS_EMPTY_STRING},
{"safeBrowsingEnableExtendedReportingDesc", IDS_SETTINGS_EMPTY_STRING},
{"networkPredictionEnabled",
IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_LABEL},
{"networkPredictionEnabledDesc", IDS_SETTINGS_EMPTY_STRING},
......@@ -1939,13 +1938,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
};
AddLocalizedStringsBulk(html_source, conditional_localized_strings,
arraysize(conditional_localized_strings));
html_source->AddLocalizedString(
"safeBrowsingEnableExtendedReporting",
safe_browsing::ChooseOptInTextResource(
*profile->GetPrefs(),
IDS_SETTINGS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING,
IDS_SETTINGS_SAFEBROWSING_ENABLE_SCOUT_REPORTING));
}
html_source->AddString(
......
components/security_interstitials_strings.grdp
View file @ 57630a24
......@@ -239,7 +239,7 @@
<ph name="BEGIN_WHITEPAPER_LINK">&lt;a href="#" id="whitepaper-link"&gt;</ph>Automatically report<ph name="END_WHITEPAPER_LINK">&lt;/a&gt;</ph> details of possible security incidents to Google. <ph name="PRIVACY_PAGE_LINK">$1</ph>
</message>
<message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_AGREE" desc="SafeBrowsing Scout label next to checkbox">
Automatically send some <ph name="BEGIN_WHITEPAPER_LINK">&lt;a href="#" id="whitepaper-link"&gt;</ph>system information and page content<ph name="END_WHITEPAPER_LINK">&lt;/a&gt;</ph> to Google to help detect dangerous apps and sites. <ph name="PRIVACY_PAGE_LINK">$1</ph>
Help improve Safe Browsing by sending some <ph name="BEGIN_WHITEPAPER_LINK">&lt;a href="#" id="whitepaper-link"&gt;</ph>system information and page content<ph name="END_WHITEPAPER_LINK">&lt;/a&gt;</ph> to Google. <ph name="PRIVACY_PAGE_LINK">$1</ph>
</message>
<!-- Harmful download interstitial -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment