diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/resources/sync_setup_overlay.html | 16 | ||||
| -rw-r--r-- | chrome/browser/resources/sync_setup_overlay.js | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/sync_setup_handler.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/sync_setup_handler2.cc | 4 | ||||
| -rw-r--r-- | chrome/common/url_constants.cc | 3 | ||||
| -rw-r--r-- | chrome/common/url_constants.h | 3 |
6 files changed, 26 insertions, 9 deletions
diff --git a/chrome/browser/resources/sync_setup_overlay.html b/chrome/browser/resources/sync_setup_overlay.html index 80629c1..4199d77 100644 --- a/chrome/browser/resources/sync_setup_overlay.html +++ b/chrome/browser/resources/sync_setup_overlay.html @@ -300,14 +300,18 @@ </div> <div id="sync-existing-passphrase-container" hidden> <div id="enter-passphrase"> - <div id="normal-body" i18n-content="enterPassphraseBody" hidden> - </div> - <div id="passphrase-rejected-body" + <span id="normal-body" i18n-content="enterPassphraseBody" hidden> + </span> + <span id="passphrase-rejected-body" i18n-content="enterOtherPassphraseBody" hidden> - </div> - <div id="google-passphrase-needed-body" + </span> + <span id="google-passphrase-needed-body" i18n-content="enterGooglePassphraseBody" hidden> - </div> + </span> + <a id="passphrase-learn-more" i18n-content="learnMore" + i18n-values="href:syncErrorHelpURL" class="reset-hidden" + target="_blank" hidden> + </a> </div> <div id="passphrase-input"> <input id="passphrase" name="passphrase" type="password" diff --git a/chrome/browser/resources/sync_setup_overlay.js b/chrome/browser/resources/sync_setup_overlay.js index 39da92e..e07fb09 100644 --- a/chrome/browser/resources/sync_setup_overlay.js +++ b/chrome/browser/resources/sync_setup_overlay.js @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -471,10 +471,9 @@ cr.define('options', function() { else $('normal-body').hidden = false; + $('passphrase-learn-more').hidden = false; $('incorrect-passphrase').hidden = !args["passphrase_setting_rejected"]; - $('sync-passphrase-warning').hidden = false; - $('passphrase').focus(); }, diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index a37b578..2bd6003d 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -241,6 +241,10 @@ void SyncSetupHandler::GetStaticLocalizedValues( "syncEverythingHelpURL", google_util::StringAppendGoogleLocaleParam( chrome::kSyncEverythingLearnMoreURL)); + localized_strings->SetString( + "syncErrorHelpURL", + google_util::StringAppendGoogleLocaleParam( + chrome::kSyncErrorsHelpURL)); // The experimental body string only appears if we are on the launch page // version of the Sync Promo. diff --git a/chrome/browser/ui/webui/sync_setup_handler2.cc b/chrome/browser/ui/webui/sync_setup_handler2.cc index 0008770..76b83f3 100644 --- a/chrome/browser/ui/webui/sync_setup_handler2.cc +++ b/chrome/browser/ui/webui/sync_setup_handler2.cc @@ -244,6 +244,10 @@ void SyncSetupHandler2::GetStaticLocalizedValues( "syncEverythingHelpURL", google_util::StringAppendGoogleLocaleParam( chrome::kSyncEverythingLearnMoreURL)); + localized_strings->SetString( + "syncErrorHelpURL", + google_util::StringAppendGoogleLocaleParam( + chrome::kSyncErrorsHelpURL)); // The experimental body string only appears if we are on the launch page // version of the Sync Promo. diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 1174751..e32ca7e 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -355,6 +355,9 @@ const char kSyncEncryptionHelpURL[] = "http://www.google.com/support/chrome/bin/answer.py?answer=1181035"; #endif +const char kSyncErrorsHelpURL[] = + "http://www.google.com/support/chrome/bin/answer.py?answer=1181420"; + const char kSyncCreateNewAccountURL[] = "https://www.google.com/accounts/NewAccount?service=chromiumsync"; diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index 0e0ee0c..ba5a610 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -314,6 +314,9 @@ extern const char kCanNotAccessAccountURL[]; // The URL for the "Learn more" page on sync encryption. extern const char kSyncEncryptionHelpURL[]; +// The URL for the "Learn more" link when there is a sync error. +extern const char kSyncErrorsHelpURL[]; + // The URL to create a new Google account via sync. extern const char kSyncCreateNewAccountURL[]; |