| Index: chrome/browser/ui/webui/sync_setup_handler.cc
|
| diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
|
| index 7ce131fefee470d60149faea6da373a9b5f01de2..b5a64f59d0268f23b90ccac9503f519d46d813f6 100644
|
| --- a/chrome/browser/ui/webui/sync_setup_handler.cc
|
| +++ b/chrome/browser/ui/webui/sync_setup_handler.cc
|
| @@ -295,7 +295,6 @@ void SyncSetupHandler::GetStaticLocalizedValues(
|
| { "openTabs", IDS_SYNC_DATATYPE_TABS },
|
| { "syncZeroDataTypesError", IDS_SYNC_ZERO_DATA_TYPES_ERROR },
|
| { "serviceUnavailableError", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR },
|
| - { "encryptAllLabel", IDS_SYNC_ENCRYPT_ALL_LABEL },
|
| { "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE },
|
| { "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT },
|
| { "sectionGoogleMessage", IDS_SYNC_PASSPHRASE_MSG_GOOGLE },
|
| @@ -310,15 +309,12 @@ void SyncSetupHandler::GetStaticLocalizedValues(
|
| { "syncEverything", IDS_SYNC_SYNC_EVERYTHING },
|
| { "useDefaultSettings", IDS_SYNC_USE_DEFAULT_SETTINGS },
|
| { "passphraseSectionTitle", IDS_SYNC_PASSPHRASE_SECTION_TITLE },
|
| - { "privacyDashboardLink", IDS_SYNC_PRIVACY_DASHBOARD_LINK_LABEL },
|
| { "enterPassphraseTitle", IDS_SYNC_ENTER_PASSPHRASE_TITLE },
|
| { "enterPassphraseBody", IDS_SYNC_ENTER_PASSPHRASE_BODY },
|
| { "enterGooglePassphraseBody", IDS_SYNC_ENTER_GOOGLE_PASSPHRASE_BODY },
|
| { "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL },
|
| { "incorrectPassphrase", IDS_SYNC_INCORRECT_PASSPHRASE },
|
| { "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING },
|
| - { "cancelWarningHeader", IDS_SYNC_PASSPHRASE_CANCEL_WARNING_HEADER },
|
| - { "cancelWarning", IDS_SYNC_PASSPHRASE_CANCEL_WARNING },
|
| { "yes", IDS_SYNC_PASSPHRASE_CANCEL_YES },
|
| { "no", IDS_SYNC_PASSPHRASE_CANCEL_NO },
|
| { "sectionExplicitMessagePrefix", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_PREFIX },
|
|
|