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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2731403005: MD Settings: Privacy: Show dialog when changing do-not-track (Closed)
Patch Set: Add learn more link Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 #if defined(OS_CHROMEOS) 1415 #if defined(OS_CHROMEOS)
1416 html_source->AddBoolean("showCupsPrintingFeatures", 1416 html_source->AddBoolean("showCupsPrintingFeatures",
1417 base::CommandLine::ForCurrentProcess()->HasSwitch( 1417 base::CommandLine::ForCurrentProcess()->HasSwitch(
1418 ::switches::kEnableNativeCups)); 1418 ::switches::kEnableNativeCups));
1419 #endif 1419 #endif
1420 } 1420 }
1421 1421
1422 void AddPrivacyStrings(content::WebUIDataSource* html_source, 1422 void AddPrivacyStrings(content::WebUIDataSource* html_source,
1423 Profile* profile) { 1423 Profile* profile) {
1424 LocalizedString localized_strings[] = { 1424 LocalizedString localized_strings[] = {
1425 {"privacyPageTitle", IDS_SETTINGS_PRIVACY}, 1425 {"privacyPageTitle", IDS_SETTINGS_PRIVACY},
1426 {"linkDoctorPref", IDS_SETTINGS_LINKDOCTOR_PREF}, 1426 {"linkDoctorPref", IDS_SETTINGS_LINKDOCTOR_PREF},
1427 {"searchSuggestPref", IDS_SETTINGS_SUGGEST_PREF}, 1427 {"searchSuggestPref", IDS_SETTINGS_SUGGEST_PREF},
1428 {"networkPredictionEnabled", 1428 {"networkPredictionEnabled",
1429 IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESCRIPTION}, 1429 IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESCRIPTION},
1430 {"safeBrowsingEnableProtection", 1430 {"safeBrowsingEnableProtection",
1431 IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION}, 1431 IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION},
1432 {"spellingPref", IDS_SETTINGS_SPELLING_PREF}, 1432 {"spellingPref", IDS_SETTINGS_SPELLING_PREF},
1433 {"spellingDescription", IDS_SETTINGS_SPELLING_DESCRIPTION}, 1433 {"spellingDescription", IDS_SETTINGS_SPELLING_DESCRIPTION},
1434 #if defined(OS_CHROMEOS) 1434 #if defined(OS_CHROMEOS)
1435 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_DIAGNOSTIC_AND_USAGE_DATA}, 1435 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_DIAGNOSTIC_AND_USAGE_DATA},
1436 #else 1436 #else
1437 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING}, 1437 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING},
1438 #endif 1438 #endif
1439 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK}, 1439 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK},
1440 {"enableContentProtectionAttestation", 1440 {"doNotTrackDialogTitle", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TITLE},
1441 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION}, 1441 {"enableContentProtectionAttestation",
1442 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION}, 1442 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION},
1443 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES}, 1443 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION},
1444 {"manageCertificatesDescription", 1444 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES},
1445 IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION}, 1445 {"manageCertificatesDescription",
1446 {"contentSettings", IDS_SETTINGS_CONTENT_SETTINGS}, 1446 IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION},
1447 {"siteSettings", IDS_SETTINGS_SITE_SETTINGS}, 1447 {"contentSettings", IDS_SETTINGS_CONTENT_SETTINGS},
1448 {"siteSettingsDescription", IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION}, 1448 {"siteSettings", IDS_SETTINGS_SITE_SETTINGS},
1449 {"clearBrowsingData", IDS_SETTINGS_CLEAR_DATA}, 1449 {"siteSettingsDescription", IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION},
1450 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, 1450 {"clearBrowsingData", IDS_SETTINGS_CLEAR_DATA},
1451 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, 1451 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
1452 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
1452 }; 1453 };
1453 AddLocalizedStringsBulk(html_source, localized_strings, 1454 AddLocalizedStringsBulk(html_source, localized_strings,
1454 arraysize(localized_strings)); 1455 arraysize(localized_strings));
1455 1456
1456 html_source->AddLocalizedString( 1457 html_source->AddLocalizedString(
1457 "safeBrowsingEnableExtendedReporting", 1458 "safeBrowsingEnableExtendedReporting",
1458 safe_browsing::ChooseOptInTextResource( 1459 safe_browsing::ChooseOptInTextResource(
1459 *profile->GetPrefs(), 1460 *profile->GetPrefs(),
1460 IDS_SETTINGS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING, 1461 IDS_SETTINGS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING,
1461 IDS_SETTINGS_SAFEBROWSING_ENABLE_SCOUT_REPORTING)); 1462 IDS_SETTINGS_SAFEBROWSING_ENABLE_SCOUT_REPORTING));
1462 html_source->AddString("improveBrowsingExperience", 1463 html_source->AddString("improveBrowsingExperience",
1463 l10n_util::GetStringFUTF16( 1464 l10n_util::GetStringFUTF16(
1464 IDS_SETTINGS_IMPROVE_BROWSING_EXPERIENCE, 1465 IDS_SETTINGS_IMPROVE_BROWSING_EXPERIENCE,
1465 base::ASCIIToUTF16(chrome::kPrivacyLearnMoreURL))); 1466 base::ASCIIToUTF16(chrome::kPrivacyLearnMoreURL)));
1466 html_source->AddString( 1467 html_source->AddString(
1468 "doNotTrackDialogMessage",
1469 l10n_util::GetStringFUTF16(
1470 IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TEXT,
1471 base::ASCIIToUTF16(chrome::kDoNotTrackLearnMoreURL)));
1472 html_source->AddString(
1467 "exceptionsLearnMoreURL", 1473 "exceptionsLearnMoreURL",
1468 base::ASCIIToUTF16(chrome::kContentSettingsExceptionsLearnMoreURL)); 1474 base::ASCIIToUTF16(chrome::kContentSettingsExceptionsLearnMoreURL));
1469 } 1475 }
1470 1476
1471 void AddSearchInSettingsStrings(content::WebUIDataSource* html_source) { 1477 void AddSearchInSettingsStrings(content::WebUIDataSource* html_source) {
1472 LocalizedString localized_strings[] = { 1478 LocalizedString localized_strings[] = {
1473 {"searchPrompt", IDS_SETTINGS_SEARCH_PROMPT}, 1479 {"searchPrompt", IDS_SETTINGS_SEARCH_PROMPT},
1474 {"searchNoResults", IDS_SETTINGS_SEARCH_NO_RESULTS}, 1480 {"searchNoResults", IDS_SETTINGS_SEARCH_NO_RESULTS},
1475 // TODO(dpapad): IDS_DOWNLOAD_CLEAR_SEARCH and IDS_MD_HISTORY_CLEAR_SEARCH 1481 // TODO(dpapad): IDS_DOWNLOAD_CLEAR_SEARCH and IDS_MD_HISTORY_CLEAR_SEARCH
1476 // are identical, merge them to one and re-use here. 1482 // are identical, merge them to one and re-use here.
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1970 1976
1971 #if defined(OS_CHROMEOS) 1977 #if defined(OS_CHROMEOS)
1972 chromeos::network_element::AddLocalizedStrings(html_source); 1978 chromeos::network_element::AddLocalizedStrings(html_source);
1973 #endif 1979 #endif
1974 policy_indicator::AddLocalizedStrings(html_source); 1980 policy_indicator::AddLocalizedStrings(html_source);
1975 1981
1976 html_source->SetJsonPath(kLocalizedStringsFile); 1982 html_source->SetJsonPath(kLocalizedStringsFile);
1977 } 1983 }
1978 1984
1979 } // namespace settings 1985 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698