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

chrome/browser/ui/webui/sync_setup_handler.cc

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 914f823f745edb3a76a69797f61db8f241a93202..ede1dbaf0d2fc7bda82d1a7e7fae7087a3ce851f 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -38,21 +38,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,
@@ -266,10 +251,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,
@@ -284,7 +271,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,
@@ -302,9 +290,13 @@ void SyncSetupHandler::GetStaticLocalizedValues(
       "promoMessageTitle",
       GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE,
                       GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
+  localized_strings->SetString(
+      "syncEverythingHelpURL",
+      google_util::StringAppendGoogleLocaleParam(
+          chrome::kSyncEverythingLearnMoreURL));
 
-  std::string create_account_url =
-      google_util::StringAppendGoogleLocaleParam(kCreateNewAccountUrl);
+  std::string create_account_url = google_util::StringAppendGoogleLocaleParam(

[James Hawkins, 2011/11/17 21:39:07]

nit: Remove extra space at EOL.

+      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 + "'>") +