[Sync Setup] Change the "sync everything" dialog "Learn more" link.

Also, move some URL constants to url_constants.h/cc.

BUG=103324
TEST=Go to chrome://settings/personal. Sign in to sync. Choose "Sync Everything". The learn more link should go to http://...answer=185277.


Review URL: http://codereview.chromium.org/8589014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114070 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/sync_setup_overlay.html

@@ -36,7 +36,8 @@
             <form id="gaia-login-form">
               <div id="email-row" class="reset-shown">
                 <label>
-                  <strong class="email-label" i18n-content="emailLabel"></strong>
+                  <strong class="email-label" i18n-content="emailLabel">
+                  </strong>
                   <input id="gaia-email" type="text" name="email" value=""
                       class="reset-enabled reset-shown reset-value"
                       autocomplete="off">
@@ -55,8 +56,8 @@
                       i18n-content="cannotBeBlank" hidden></div>
                 <label>
               </div>
-              <div id="access-code-input-row" class="access-code-row reset-hidden"
-                  hidden>
+              <div id="access-code-input-row"
+                  class="access-code-row reset-hidden" hidden>
                 <label>
                   <strong i18n-content="enterAccessCode"></strong>
                   <a i18n-values="href:getAccessCodeURL"
@@ -66,7 +67,8 @@
                       class="reset-enabled reset-value">
                 </label>
               </div>
-              <div id="errormsg-1-password" class="errormsg reset-hidden" hidden>
+              <div id="errormsg-1-password" class="errormsg reset-hidden"
+                  hidden>
                 <span i18n-content="invalidCredentials"></span>
                 <a i18n-values="href:invalidPasswordHelpURL" class="help-link"
                     target="_blank">?</a>
@@ -138,7 +140,8 @@
       <div id="sync-instructions-container" class="content-area">
         <span i18n-content="chooseDataTypesInstructions"></span>
         <a id="encryption-help-link" target="_blank"
-            i18n-values="href:encryptionHelpURL" i18n-content="learnMore"></a>
+            i18n-values="href:syncEverythingHelpURL" i18n-content="learnMore">
+        </a>
       </div>
       <div>
         <div class="action-area">

chrome/browser/ui/webui/sync_setup_handler.cc

@@ -40,21 +40,6 @@ using l10n_util::GetStringUTF16;
 
 namespace {
 
-// TODO(jhawkins): Move these to url_constants.h.
-const char* kInvalidPasswordHelpUrl =
-    "http://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444";
-const char* kCanNotAccessAccountUrl =
-    "http://www.google.com/support/accounts/bin/answer.py?answer=48598";
-#if defined(OS_CHROMEOS)
-const char* kEncryptionHelpUrl =
-    "http://www.google.com/support/chromeos/bin/answer.py?answer=1181035";
-#else
-const char* kEncryptionHelpUrl =
-    "http://www.google.com/support/chrome/bin/answer.py?answer=1181035";
-#endif
-const char* kCreateNewAccountUrl =
-    "https://www.google.com/accounts/NewAccount?service=chromiumsync";
-
 bool GetAuthData(const std::string& json,
                  std::string* username,
                  std::string* password,
@@ -269,10 +254,12 @@ void SyncSetupHandler::GetStaticLocalizedValues(
 
   localized_strings->SetString(
       "invalidPasswordHelpURL",
-      google_util::StringAppendGoogleLocaleParam(kInvalidPasswordHelpUrl));
+      google_util::StringAppendGoogleLocaleParam(
+          chrome::kInvalidPasswordHelpURL));
   localized_strings->SetString(
       "cannotAccessAccountURL",
-      google_util::StringAppendGoogleLocaleParam(kCanNotAccessAccountUrl));
+      google_util::StringAppendGoogleLocaleParam(
+          chrome::kCanNotAccessAccountURL));
   localized_strings->SetString(
       "introduction",
       GetStringFUTF16(IDS_SYNC_LOGIN_INTRODUCTION,
@@ -287,7 +274,8 @@ void SyncSetupHandler::GetStaticLocalizedValues(
                       GetStringUTF16(IDS_PRODUCT_NAME)));
   localized_strings->SetString(
       "encryptionHelpURL",
-      google_util::StringAppendGoogleLocaleParam(kEncryptionHelpUrl));
+      google_util::StringAppendGoogleLocaleParam(
+          chrome::kSyncEncryptionHelpURL));
   localized_strings->SetString(
       "passphraseEncryptionMessage",
       GetStringFUTF16(IDS_SYNC_PASSPHRASE_ENCRYPTION_MESSAGE,
@@ -305,6 +293,10 @@ void SyncSetupHandler::GetStaticLocalizedValues(
       "promoMessageTitle",
       GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE,
                       GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
+  localized_strings->SetString(
+      "syncEverythingHelpURL",
+      google_util::StringAppendGoogleLocaleParam(
+          chrome::kSyncEverythingLearnMoreURL));
 
   // The experimental body string only appears if we are on the launch page
   // version of the Sync Promo.
@@ -317,8 +309,8 @@ void SyncSetupHandler::GetStaticLocalizedValues(
       "promoMessageBody",
       GetStringUTF16(message_body_resource_id));
 
-  std::string create_account_url =
-      google_util::StringAppendGoogleLocaleParam(kCreateNewAccountUrl);
+  std::string create_account_url = google_util::StringAppendGoogleLocaleParam(
+      chrome::kSyncCreateNewAccountURL);
   string16 create_account = GetStringUTF16(IDS_SYNC_CREATE_ACCOUNT);
   create_account= UTF8ToUTF16("<a id='create-account-link' target='_blank' "
       "class='account-link' href='" + create_account_url + "'>") +

chrome/common/url_constants.cc

@@ -325,11 +325,30 @@ const char kSyncLearnMoreURL[] =
 const char kDownloadScanningLearnMoreURL[] =
     "http://www.google.com/support/chrome/bin/answer.py?answer=99020";
 
+const char kSyncEverythingLearnMoreURL[] =
+    "https://www.google.com/support/chrome/bin/answer.py?answer=185277";
+
 #if defined(OS_CHROMEOS)
 const char kCloudPrintLearnMoreURL[] =
     "https://www.google.com/support/chromeos/bin/topic.py?topic=29023";
 #endif
 
+const char kInvalidPasswordHelpURL[] =
+    "http://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444";
+
+const char kCanNotAccessAccountURL[] =
+    "http://www.google.com/support/accounts/bin/answer.py?answer=48598";
+
+const char kSyncEncryptionHelpURL[] =
+#if defined(OS_CHROMEOS)
+    "http://www.google.com/support/chromeos/bin/answer.py?answer=1181035";
+#else
+    "http://www.google.com/support/chrome/bin/answer.py?answer=1181035";
+#endif
+
+const char kSyncCreateNewAccountURL[] =
+    "https://www.google.com/accounts/NewAccount?service=chromiumsync";
+
 const char* const kChromeDebugURLs[] = {
   kChromeUICrashURL,
   kChromeUIKillURL,

chrome/common/url_constants.h

@@ -296,6 +296,23 @@ extern const char kSyncLearnMoreURL[];
 // The URL for the "Learn more" page for download scanning.
 extern const char kDownloadScanningLearnMoreURL[];
 
+// The URL for the "Learn more" page on the sync setup dialog, when syncing
+// everything.
+extern const char kSyncEverythingLearnMoreURL[];
+
+// The URL for information on how to recover your password.
+extern const char kInvalidPasswordHelpURL[];
+
+// The URL for information on what to do if you can't sign in to your Google
+// account.
+extern const char kCanNotAccessAccountURL[];
+
+// The URL for the "Learn more" page on sync encryption.
+extern const char kSyncEncryptionHelpURL[];
+
+// The URL to create a new Google account via sync.
+extern const char kSyncCreateNewAccountURL[];
+
 // "Debug" pages which are dangerous and not for general consumption.
 extern const char* const kChromeDebugURLs[];
 extern int kNumberOfChromeDebugURLs;