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

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: Rebase Use on-settings-boolean-control-change 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
« no previous file with comments | « chrome/browser/resources/settings/privacy_page/privacy_page.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1423 #if defined(OS_CHROMEOS) 1423 #if defined(OS_CHROMEOS)
1424 html_source->AddBoolean("showCupsPrintingFeatures", 1424 html_source->AddBoolean("showCupsPrintingFeatures",
1425 base::CommandLine::ForCurrentProcess()->HasSwitch( 1425 base::CommandLine::ForCurrentProcess()->HasSwitch(
1426 ::switches::kEnableNativeCups)); 1426 ::switches::kEnableNativeCups));
1427 #endif 1427 #endif
1428 } 1428 }
1429 1429
1430 void AddPrivacyStrings(content::WebUIDataSource* html_source, 1430 void AddPrivacyStrings(content::WebUIDataSource* html_source,
1431 Profile* profile) { 1431 Profile* profile) {
1432 LocalizedString localized_strings[] = { 1432 LocalizedString localized_strings[] = {
1433 {"privacyPageTitle", IDS_SETTINGS_PRIVACY}, 1433 {"privacyPageTitle", IDS_SETTINGS_PRIVACY},
1434 {"linkDoctorPref", IDS_SETTINGS_LINKDOCTOR_PREF}, 1434 {"linkDoctorPref", IDS_SETTINGS_LINKDOCTOR_PREF},
1435 {"searchSuggestPref", IDS_SETTINGS_SUGGEST_PREF}, 1435 {"searchSuggestPref", IDS_SETTINGS_SUGGEST_PREF},
1436 {"networkPredictionEnabled", 1436 {"networkPredictionEnabled",
1437 IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESCRIPTION}, 1437 IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESCRIPTION},
1438 {"safeBrowsingEnableProtection", 1438 {"safeBrowsingEnableProtection",
1439 IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION}, 1439 IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION},
1440 {"spellingPref", IDS_SETTINGS_SPELLING_PREF}, 1440 {"spellingPref", IDS_SETTINGS_SPELLING_PREF},
1441 {"spellingDescription", IDS_SETTINGS_SPELLING_DESCRIPTION}, 1441 {"spellingDescription", IDS_SETTINGS_SPELLING_DESCRIPTION},
1442 #if defined(OS_CHROMEOS) 1442 #if defined(OS_CHROMEOS)
1443 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_DIAGNOSTIC_AND_USAGE_DATA}, 1443 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_DIAGNOSTIC_AND_USAGE_DATA},
1444 #else 1444 #else
1445 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING}, 1445 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING},
1446 #endif 1446 #endif
1447 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK}, 1447 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK},
1448 {"enableContentProtectionAttestation", 1448 {"doNotTrackDialogTitle", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TITLE},
1449 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION}, 1449 {"enableContentProtectionAttestation",
1450 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION}, 1450 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION},
1451 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES}, 1451 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION},
1452 {"manageCertificatesDescription", 1452 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES},
1453 IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION}, 1453 {"manageCertificatesDescription",
1454 {"contentSettings", IDS_SETTINGS_CONTENT_SETTINGS}, 1454 IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION},
1455 {"siteSettings", IDS_SETTINGS_SITE_SETTINGS}, 1455 {"contentSettings", IDS_SETTINGS_CONTENT_SETTINGS},
1456 {"siteSettingsDescription", IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION}, 1456 {"siteSettings", IDS_SETTINGS_SITE_SETTINGS},
1457 {"clearBrowsingData", IDS_SETTINGS_CLEAR_DATA}, 1457 {"siteSettingsDescription", IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION},
1458 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, 1458 {"clearBrowsingData", IDS_SETTINGS_CLEAR_DATA},
1459 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, 1459 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
1460 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
1460 }; 1461 };
1461 AddLocalizedStringsBulk(html_source, localized_strings, 1462 AddLocalizedStringsBulk(html_source, localized_strings,
1462 arraysize(localized_strings)); 1463 arraysize(localized_strings));
1463 1464
1464 html_source->AddLocalizedString( 1465 html_source->AddLocalizedString(
1465 "safeBrowsingEnableExtendedReporting", 1466 "safeBrowsingEnableExtendedReporting",
1466 safe_browsing::ChooseOptInTextResource( 1467 safe_browsing::ChooseOptInTextResource(
1467 *profile->GetPrefs(), 1468 *profile->GetPrefs(),
1468 IDS_SETTINGS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING, 1469 IDS_SETTINGS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING,
1469 IDS_SETTINGS_SAFEBROWSING_ENABLE_SCOUT_REPORTING)); 1470 IDS_SETTINGS_SAFEBROWSING_ENABLE_SCOUT_REPORTING));
1470 html_source->AddString("improveBrowsingExperience", 1471 html_source->AddString("improveBrowsingExperience",
1471 l10n_util::GetStringFUTF16( 1472 l10n_util::GetStringFUTF16(
1472 IDS_SETTINGS_IMPROVE_BROWSING_EXPERIENCE, 1473 IDS_SETTINGS_IMPROVE_BROWSING_EXPERIENCE,
1473 base::ASCIIToUTF16(chrome::kPrivacyLearnMoreURL))); 1474 base::ASCIIToUTF16(chrome::kPrivacyLearnMoreURL)));
1474 html_source->AddString( 1475 html_source->AddString(
1476 "doNotTrackDialogMessage",
1477 l10n_util::GetStringFUTF16(
1478 IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TEXT,
1479 base::ASCIIToUTF16(chrome::kDoNotTrackLearnMoreURL)));
1480 html_source->AddString(
1475 "exceptionsLearnMoreURL", 1481 "exceptionsLearnMoreURL",
1476 base::ASCIIToUTF16(chrome::kContentSettingsExceptionsLearnMoreURL)); 1482 base::ASCIIToUTF16(chrome::kContentSettingsExceptionsLearnMoreURL));
1477 } 1483 }
1478 1484
1479 void AddSearchInSettingsStrings(content::WebUIDataSource* html_source) { 1485 void AddSearchInSettingsStrings(content::WebUIDataSource* html_source) {
1480 LocalizedString localized_strings[] = { 1486 LocalizedString localized_strings[] = {
1481 {"searchPrompt", IDS_SETTINGS_SEARCH_PROMPT}, 1487 {"searchPrompt", IDS_SETTINGS_SEARCH_PROMPT},
1482 {"searchNoResults", IDS_SETTINGS_SEARCH_NO_RESULTS}, 1488 {"searchNoResults", IDS_SETTINGS_SEARCH_NO_RESULTS},
1483 {"searchResults", IDS_SETTINGS_SEARCH_RESULTS}, 1489 {"searchResults", IDS_SETTINGS_SEARCH_RESULTS},
1484 // TODO(dpapad): IDS_DOWNLOAD_CLEAR_SEARCH and IDS_MD_HISTORY_CLEAR_SEARCH 1490 // TODO(dpapad): IDS_DOWNLOAD_CLEAR_SEARCH and IDS_MD_HISTORY_CLEAR_SEARCH
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1978 1984
1979 #if defined(OS_CHROMEOS) 1985 #if defined(OS_CHROMEOS)
1980 chromeos::network_element::AddLocalizedStrings(html_source); 1986 chromeos::network_element::AddLocalizedStrings(html_source);
1981 #endif 1987 #endif
1982 policy_indicator::AddLocalizedStrings(html_source); 1988 policy_indicator::AddLocalizedStrings(html_source);
1983 1989
1984 html_source->SetJsonPath(kLocalizedStringsFile); 1990 html_source->SetJsonPath(kLocalizedStringsFile);
1985 } 1991 }
1986 1992
1987 } // namespace settings 1993 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/privacy_page/privacy_page.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698