diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 18:49:44 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 18:49:44 +0000 |
| commit | b29974139602e00760b943340523b45b3296bb8f (patch) | |
| tree | 050d942c2078306f992761bbfdab22cff552678a /chrome/browser/ui | |
| parent | 8a7299801481da83df1ecf830200b84b192a6876 (diff) | |
| download | chromium_src-b29974139602e00760b943340523b45b3296bb8f.zip chromium_src-b29974139602e00760b943340523b45b3296bb8f.tar.gz chromium_src-b29974139602e00760b943340523b45b3296bb8f.tar.bz2 | |
Sync: Remove the passphrase page and inline passphrase input in the Customize screen.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7076025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/options/sync_setup_handler.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc index 84cb58e6..4193c29 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc @@ -11,6 +11,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_setup_flow.h" +#include "chrome/common/url_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -182,6 +183,10 @@ void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) { "passphraseEncryptionMessage", GetStringFUTF16(IDS_SYNC_PASSPHRASE_ENCRYPTION_MESSAGE, GetStringUTF16(IDS_PRODUCT_NAME))); + localized_strings->SetString( + "passphraseRecover", + GetStringFUTF16(IDS_SYNC_PASSPHRASE_RECOVER, + ASCIIToUTF16(chrome::kSyncGoogleDashboardURL))); static OptionsStringResource resources[] = { { "syncSetupOverlayTitle", IDS_SYNC_SETUP_TITLE }, @@ -227,7 +232,6 @@ void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) { { "emptyErrorMessage", IDS_SYNC_EMPTY_PASSPHRASE_ERROR }, { "mismatchErrorMessage", IDS_SYNC_PASSPHRASE_MISMATCH_ERROR }, { "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING }, - { "clearDataLink", IDS_SYNC_CLEAR_DATA_LINK }, { "customizeLinkLabel", IDS_SYNC_CUSTOMIZE_LINK_LABEL }, { "confirmSyncPreferences", IDS_SYNC_CONFIRM_SYNC_PREFERENCES }, { "syncEverything", IDS_SYNC_SYNC_EVERYTHING }, @@ -239,7 +243,6 @@ void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) { { "enterOtherPassphraseBody", IDS_SYNC_ENTER_OTHER_PASSPHRASE_BODY }, { "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL }, { "incorrectPassphrase", IDS_SYNC_INCORRECT_PASSPHRASE }, - { "passphraseRecover", IDS_SYNC_PASSPHRASE_RECOVER }, { "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING }, { "cancelWarningHeader", IDS_SYNC_PASSPHRASE_CANCEL_WARNING_HEADER }, { "cancelWarning", IDS_SYNC_PASSPHRASE_CANCEL_WARNING }, |