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

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

Issue 2250733003: Settings People Sync: Add 'Reset Sync' message for forgotten passphrase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@244-settings-people-fix-error-message
Patch Set: address comments Created 4 years, 4 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/people_page/sync_page.html ('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 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 956
957 // Format numbers to be used on the pin keyboard. 957 // Format numbers to be used on the pin keyboard.
958 for (int j = 0; j <= 9; j++) { 958 for (int j = 0; j <= 9; j++) {
959 html_source->AddString("pinKeyboard" + base::IntToString(j), 959 html_source->AddString("pinKeyboard" + base::IntToString(j),
960 base::FormatNumber(int64_t{j})); 960 base::FormatNumber(int64_t{j}));
961 } 961 }
962 962
963 html_source->AddString("autofillHelpURL", autofill::kHelpURL); 963 html_source->AddString("autofillHelpURL", autofill::kHelpURL);
964 html_source->AddString("supervisedUsersUrl", 964 html_source->AddString("supervisedUsersUrl",
965 chrome::kLegacySupervisedUserManagementURL); 965 chrome::kLegacySupervisedUserManagementURL);
966
966 std::string sync_dashboard_url = 967 std::string sync_dashboard_url =
967 google_util::AppendGoogleLocaleParam( 968 google_util::AppendGoogleLocaleParam(
968 GURL(chrome::kSyncGoogleDashboardURL), 969 GURL(chrome::kSyncGoogleDashboardURL),
969 g_browser_process->GetApplicationLocale()) 970 g_browser_process->GetApplicationLocale())
970 .spec(); 971 .spec();
971 html_source->AddString("syncDashboardUrl", sync_dashboard_url); 972 html_source->AddString("syncDashboardUrl", sync_dashboard_url);
972 html_source->AddString( 973 html_source->AddString(
973 "activityControlsUrl", 974 "passphraseRecover",
974 base::ASCIIToUTF16(chrome::kGoogleAccountActivityControlsURL)); 975 l10n_util::GetStringFUTF8(IDS_SETTINGS_PASSPHRASE_RECOVER,
976 base::ASCIIToUTF16(sync_dashboard_url)));
977
978 html_source->AddString("activityControlsUrl",
979 chrome::kGoogleAccountActivityControlsURL);
975 } 980 }
976 981
977 void AddPrintingStrings(content::WebUIDataSource* html_source) { 982 void AddPrintingStrings(content::WebUIDataSource* html_source) {
978 LocalizedString localized_strings[] = { 983 LocalizedString localized_strings[] = {
979 {"printingPageTitle", IDS_SETTINGS_PRINTING}, 984 {"printingPageTitle", IDS_SETTINGS_PRINTING},
980 {"printingCloudPrintLearnMoreLabel", 985 {"printingCloudPrintLearnMoreLabel",
981 IDS_SETTINGS_PRINTING_CLOUD_PRINT_LEARN_MORE_LABEL}, 986 IDS_SETTINGS_PRINTING_CLOUD_PRINT_LEARN_MORE_LABEL},
982 {"printingNotificationsLabel", IDS_SETTINGS_PRINTING_NOTIFICATIONS_LABEL}, 987 {"printingNotificationsLabel", IDS_SETTINGS_PRINTING_NOTIFICATIONS_LABEL},
983 {"printingManageCloudPrintDevices", 988 {"printingManageCloudPrintDevices",
984 IDS_SETTINGS_PRINTING_MANAGE_CLOUD_PRINT_DEVICES}, 989 IDS_SETTINGS_PRINTING_MANAGE_CLOUD_PRINT_DEVICES},
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 #endif 1433 #endif
1429 AddUsersStrings(html_source); 1434 AddUsersStrings(html_source);
1430 AddWebContentStrings(html_source); 1435 AddWebContentStrings(html_source);
1431 1436
1432 policy_indicator::AddLocalizedStrings(html_source); 1437 policy_indicator::AddLocalizedStrings(html_source);
1433 1438
1434 html_source->SetJsonPath(kLocalizedStringsFile); 1439 html_source->SetJsonPath(kLocalizedStringsFile);
1435 } 1440 }
1436 1441
1437 } // namespace settings 1442 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/people_page/sync_page.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698