Sync: Refresh the UI to match Alex's mocks.

chrome/browser/sync/sync_setup_wizard.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/sync/sync_setup_wizard.h"
 
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
+const char* kInvalidPasswordHelpUrl =
+    "https://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444";
+const char* kCanNotAccessAccountUrl =
+    "https://www.google.com/support/accounts/bin/answer.py?answer=48598";
+#if defined(OS_CHROMEOS)
+const char* kEncryptionHelpUrl =
+    "https://www.google.com/support/chromeos/bin/answer.py?answer=1181035";
+#else
+const char* kEncryptionHelpUrl =
+    "https://www.google.com/support/chrome/bin/answer.py?answer=1181035";
+#endif
+const char* kCreateNewAccountUrl =
+    "https://www.google.com/accounts/NewAccount?service=chromiumsync";
+const char* kSyncHelpUrl =
+    "https://www.google.com/support/chrome/bin/answer.py?hl=en&answer=165139";
+
 // Utility method to keep dictionary population code streamlined.
 void AddString(DictionaryValue* dictionary,
                const std::string& key,
                int resource_id) {
   dictionary->SetString(key, l10n_util::GetStringUTF16(resource_id));
 }
 
 }
 
 class SyncResourcesSource : public ChromeURLDataManager::DataSource {
  public:
   SyncResourcesSource()
       : DataSource(chrome::kChromeUISyncResourcesHost, MessageLoop::current()) {
   }
 
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string& path) const {
     return "text/html";
   }
 
-  static const char* kInvalidPasswordHelpUrl;
-  static const char* kCanNotAccessAccountUrl;
-  static const char* kCreateNewAccountUrl;
-  static const char* kEncryptionHelpUrl;
-
  private:
   virtual ~SyncResourcesSource() {}
 
   // Takes a string containing an URL and returns an URL containing a CGI
   // parameter of the form "&hl=xy" where 'xy' is the language code of the
   // current locale.
   std::string GetLocalizedUrl(const std::string& url) const;
 
   DISALLOW_COPY_AND_ASSIGN(SyncResourcesSource);
 };
 
-const char* SyncResourcesSource::kInvalidPasswordHelpUrl =
-    "https://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444";
-const char* SyncResourcesSource::kCanNotAccessAccountUrl =
-    "https://www.google.com/support/accounts/bin/answer.py?answer=48598";
-#if defined(OS_CHROMEOS)
-const char* SyncResourcesSource::kEncryptionHelpUrl =
-    "https://www.google.com/support/chromeos/bin/answer.py?answer=1181035";
-#else
-const char* SyncResourcesSource::kEncryptionHelpUrl =
-    "https://www.google.com/support/chrome/bin/answer.py?answer=1181035";
-#endif
-const char* SyncResourcesSource::kCreateNewAccountUrl =
-    "https://www.google.com/accounts/NewAccount?service=chromiumsync";
+
 
 void SyncResourcesSource::StartDataRequest(const std::string& path_raw,
                                            bool is_incognito,
                                            int request_id) {
   using l10n_util::GetStringUTF16;
   using l10n_util::GetStringFUTF16;
 
   const char kSyncSetupFlowPath[] = "setup";
   const char kSyncGaiaLoginPath[] = "gaialogin";
   const char kSyncConfigurePath[] = "configure";
   const char kSyncPassphrasePath[] = "passphrase";
   const char kSyncFirstPassphrasePath[] = "firstpassphrase";
   const char kSyncSettingUpPath[] = "settingup";
   const char kSyncSetupDonePath[] = "setupdone";
 
   std::string response;
   DictionaryValue strings;
   DictionaryValue* dict = &strings;
   int html_resource_id = 0;
   if (path_raw == kSyncGaiaLoginPath) {
     html_resource_id = IDR_GAIA_LOGIN_HTML;
 
     // Start by setting the per-locale URLs we show on the setup wizard.
     dict->SetString("invalidpasswordhelpurl",
                     GetLocalizedUrl(kInvalidPasswordHelpUrl));
     dict->SetString("cannotaccessaccounturl",
                     GetLocalizedUrl(kCanNotAccessAccountUrl));
     dict->SetString("createnewaccounturl",
                     GetLocalizedUrl(kCreateNewAccountUrl));
+    dict->SetString("synchelpurl",
+                    GetLocalizedUrl(kSyncHelpUrl));
     AddString(dict, "settingupsync", IDS_SYNC_LOGIN_SETTING_UP_SYNC);
-    dict->SetString("introduction",
-        GetStringFUTF16(IDS_SYNC_LOGIN_INTRODUCTION,
-                        GetStringUTF16(IDS_PRODUCT_NAME)));
     AddString(dict, "signinprefix", IDS_SYNC_LOGIN_SIGNIN_PREFIX);
     AddString(dict, "signinsuffix", IDS_SYNC_LOGIN_SIGNIN_SUFFIX);
     AddString(dict, "cannotbeblank", IDS_SYNC_CANNOT_BE_BLANK);
     AddString(dict, "emaillabel", IDS_SYNC_LOGIN_EMAIL);
     AddString(dict, "passwordlabel", IDS_SYNC_LOGIN_PASSWORD);
     AddString(dict, "invalidcredentials", IDS_SYNC_INVALID_USER_CREDENTIALS);
     AddString(dict, "signin", IDS_SYNC_SIGNIN);
     AddString(dict, "couldnotconnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT);
     AddString(dict, "cannotaccessaccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT);
     AddString(dict, "createaccount", IDS_SYNC_CREATE_ACCOUNT);
     AddString(dict, "cancel", IDS_CANCEL);
     AddString(dict, "settingup", IDS_SYNC_LOGIN_SETTING_UP);
     AddString(dict, "success", IDS_SYNC_SUCCESS);
     AddString(dict, "errorsigningin", IDS_SYNC_ERROR_SIGNING_IN);
     AddString(dict, "captchainstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS);
     AddString(dict, "invalidaccesscode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL);
     AddString(dict, "enteraccesscode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL);
     AddString(dict, "getaccesscodehelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL);
     AddString(dict, "getaccesscodeurl", IDS_SYNC_GET_ACCESS_CODE_URL);
   } else if (path_raw == kSyncConfigurePath) {
     html_resource_id = IDR_SYNC_CONFIGURE_HTML;
 
     AddString(dict, "dataTypes", IDS_SYNC_DATA_TYPES_TAB_NAME);
     AddString(dict, "encryption", IDS_SYNC_ENCRYPTION_TAB_NAME);
+    AddString(

[csilv, 2011/04/16 01:03:55]

okay, totally picky...  the new lines 136, 164, and 169 each employ a different
wrapping method.  consider choosing one... personally i like 164.

[James Hawkins, 2011/04/17 19:05:05]

Made 164 like 136; 169 can't be wrapped the same because the args don't all fit
one on line at any point.

+        dict, "confirmSyncPreferences", IDS_SYNC_CONFIRM_SYNC_PREFERENCES);
+    AddString(dict, "syncEverything", IDS_SYNC_SYNC_EVERYTHING);
 
     // Stuff for the choose data types localized.
     AddString(dict, "choosedatatypesheader", IDS_SYNC_CHOOSE_DATATYPES_HEADER);
     dict->SetString("choosedatatypesinstructions",
         GetStringFUTF16(IDS_SYNC_CHOOSE_DATATYPES_INSTRUCTIONS,
                         GetStringUTF16(IDS_PRODUCT_NAME)));
     AddString(dict, "keepeverythingsynced", IDS_SYNC_EVERYTHING);
     AddString(dict, "choosedatatypes", IDS_SYNC_CHOOSE_DATATYPES);
     AddString(dict, "bookmarks", IDS_SYNC_DATATYPE_BOOKMARKS);
     AddString(dict, "preferences", IDS_SYNC_DATATYPE_PREFERENCES);
     AddString(dict, "autofill", IDS_SYNC_DATATYPE_AUTOFILL);
     AddString(dict, "themes", IDS_SYNC_DATATYPE_THEMES);
     AddString(dict, "passwords", IDS_SYNC_DATATYPE_PASSWORDS);
     AddString(dict, "extensions", IDS_SYNC_DATATYPE_EXTENSIONS);
     AddString(dict, "typedurls", IDS_SYNC_DATATYPE_TYPED_URLS);
     AddString(dict, "apps", IDS_SYNC_DATATYPE_APPS);
     AddString(dict, "foreignsessions", IDS_SYNC_DATATYPE_SESSIONS);
     AddString(dict, "synczerodatatypeserror", IDS_SYNC_ZERO_DATA_TYPES_ERROR);
     AddString(dict, "abortederror", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR);
 
     // Stuff for the encryption tab.
     dict->SetString("encryptionInstructions",
         GetStringFUTF16(IDS_SYNC_ENCRYPTION_INSTRUCTIONS,
                         GetStringUTF16(IDS_PRODUCT_NAME)));
     AddString(dict, "encryptAllLabel", IDS_SYNC_ENCRYPT_ALL_LABEL);
-
+    AddString(dict, "passphraseSectionTitle",
+              IDS_SYNC_PASSPHRASE_SECTION_TITLE);
     AddString(dict, "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE);
     AddString(dict, "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT);
     AddString(dict, "sectionGoogleMessage", IDS_SYNC_PASSPHRASE_MSG_GOOGLE);
-    AddString(dict, "sectionExplicitMessage", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT);
+    AddString(dict,
+              "sectionExplicitMessagePrefix",
+              IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_PREFIX);
+    AddString(dict,
+              "sectionExplicitMessagePostfix",
+              IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_POSTFIX);
     AddString(dict, "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL);
     AddString(dict, "confirmLabel", IDS_SYNC_CONFIRM_PASSPHRASE_LABEL);
     AddString(dict, "emptyErrorMessage", IDS_SYNC_EMPTY_PASSPHRASE_ERROR);
     AddString(dict, "mismatchErrorMessage", IDS_SYNC_PASSPHRASE_MISMATCH_ERROR);
 
     AddString(dict, "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING);
     AddString(dict, "cleardata", IDS_SYNC_CLEAR_DATA_FOR_PASSPHRASE);
     AddString(dict, "cleardatalink", IDS_SYNC_CLEAR_DATA_LINK);
 
     AddString(dict, "learnmore", IDS_LEARN_MORE);
     dict->SetString("encryptionhelpurl",
                     GetLocalizedUrl(kEncryptionHelpUrl));
 
     // Stuff for the footer.
+    AddString(dict, "customizelinklabel", IDS_SYNC_CUSTOMIZE_LINK_LABEL);
     AddString(dict, "ok", IDS_OK);
     AddString(dict, "cancel", IDS_CANCEL);
   } else if (path_raw == kSyncPassphrasePath) {
     html_resource_id = IDR_SYNC_PASSPHRASE_HTML;
     AddString(dict, "enterPassphraseTitle", IDS_SYNC_ENTER_PASSPHRASE_TITLE);
     AddString(dict, "enterPassphraseBody", IDS_SYNC_ENTER_PASSPHRASE_BODY);
     AddString(dict, "enterOtherPassphraseBody",
               IDS_SYNC_ENTER_OTHER_PASSPHRASE_BODY);
     AddString(dict, "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL);
     AddString(dict, "incorrectPassphrase", IDS_SYNC_INCORRECT_PASSPHRASE);
@@ skipping 147 matching lines @@
     result = GAIA_SUCCESS;
   } else if (start_state == ENTER_PASSPHRASE ||
              start_state == CONFIGURE ||
              start_state == PASSPHRASE_MIGRATION) {
     result = DONE;
   }
   DCHECK_NE(FATAL_ERROR, result) <<
       "Invalid start state for discrete run: " << start_state;
   return result;
 }