Options: Clean up the sync setup overlay, part 2.

* Use camelCase for i18n values.

BUG=none
TEST=none

R=csilv@chromium.org

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

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

4 files changed, 59 insertions, 79 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e2d5c48..cfc32f9 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -8730,9 +8730,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_SYNC_PASSPHRASE_MSG_CANCEL" desc="Message when not syncing passwords is selected.">
         You have chosen not to sync passwords; you can always change your mind later by changing your sync settings.
       </message>
-      <message name="IDS_SYNC_CLEAR_DATA_FOR_PASSPHRASE" desc="Text on a button which clears data if the user wants to clear out their passphrase.">
-        Reset sync
-      </message>
       <message name="IDS_SYNC_LOGIN_INFO_OUT_OF_DATE" desc="The login information for the user is out of date - for example, the user changed their password and therefore signing in again is required.">
         Account sign-in details are out of date.
       </message>
@@ -8827,9 +8824,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_CUSTOMIZE_SYNC_DESCRIPTION" desc="The first line of the Customize Sync dialog, explaining what this box does.">
         Sync the following items automatically:
       </message>
-      <message name="IDS_SYNC_CHOOSE_DATATYPES_HEADER" desc="Title of the 'Choose Datatypes' dialog.">
-        Configure sync
-      </message>
       <message name="IDS_SYNC_CHOOSE_DATATYPES_INSTRUCTIONS" desc="Text explaining the 'Choose Datatypes' dialog.">
         <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> securely syncs your data with your Google account. Keep everything synced or customize synced data types and encryption options.
       </message>
@@ -9019,10 +9013,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       </if>
 
       <!-- Success dialog strings -->
-      <message name="IDS_SYNC_SETUP_FIRST_TIME_ALL_DONE" desc="The text shown on the confirmation dialog after setting up sync when no bookmarks exist in the cloud.">
-        Your bookmarks are now synced to Google Docs! To merge and sync your bookmarks to <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
-        on another computer, just repeat the same setup process on that computer.
-      </message>
       <message name="IDS_SYNC_SETUP_OK_BUTTON_LABEL" desc="The button label on the 'OK' button displayed at the end of sync setup.">
         OK
       </message>
diff --git a/chrome/browser/resources/options/sync_setup_overlay.html b/chrome/browser/resources/options/sync_setup_overlay.html
index 2d0d9d5..a260652 100644
--- a/chrome/browser/resources/options/sync_setup_overlay.html
+++ b/chrome/browser/resources/options/sync_setup_overlay.html
@@ -4,7 +4,7 @@
     <div class="content-area">
       <div>
         <div id="top-blurb-error">
-          <span id="error-signing-in" i18n-content="errorsigningin"></span>
+          <span id="error-signing-in" i18n-content="errorSigningIn"></span>
           <span id="error-custom"></span>
         </div>
         <form id="gaia-login-form">
@@ -23,14 +23,14 @@
                             <tr>
                               <td>
                                 <span id="gaia-account-text-prefix"
-                                    i18n-content="signinprefix"></span>
+                                    i18n-content="signinPrefix"></span>
                               </td>
                               <td id="gaia-logo" valign="top">
                                 <img src="google-transparent.png" alt="Google">
                               </td>
                               <td valign="middle">
                                 <span id="gaia-account-text"
-                                    i18n-content="signinsuffix"></span>
+                                    i18n-content="signinSuffix"></span>
                               </td>
                             </tr>
                           </table>
@@ -42,7 +42,7 @@
                       <tr id="email-row">
                         <td nowrap="nowrap">
                           <div class="end-aligned">
-                            <span i18n-content="emaillabel">
+                            <span i18n-content="emailLabel">
                             </span>
                           </div>
                         </td>
@@ -54,26 +54,26 @@
                       </tr>
                       <tr id="access-code-label-row" class="access-code-row">
                         <td colspan="2">
-                          <span i18n-content="enteraccesscode"></span>
+                          <span i18n-content="enterAccessCode"></span>
                         </td>
                       </tr>
                       <tr id="access-code-help-row" class="access-code-row">
                         <td colspan="2">
-                          <a i18n-values="href:getaccesscodeurl"
-                              i18n-content="getaccesscodehelp" target="_blank">
+                          <a i18n-values="href:getAccessCodeURL"
+                              i18n-content="getAccessCodeHelp" target="_blank">
                           </a>
                         </td>
                       <tr>
                         <td></td>
                         <td>
                           <div id="errormsg-0-email" class="errormsg"
-                              i18n-content="cannotbeblank">
+                              i18n-content="cannotBeBlank">
                           </div>
                         </td>
                       </tr>
                       <tr id="password-row">
                         <td class="end-aligned">
-                          <span i18n-content="passwordlabel"></span>
+                          <span i18n-content="passwordLabel"></span>
                         </td>
                         <td>
                           <input id="gaia-passwd" type="password" name="passwd"
@@ -91,16 +91,16 @@
                         <td>
                           <div class="error-msg-spacer">
                             <div id="errormsg-0-password" class="errormsg"
-                                i18n-content="cannotbeblank">
+                                i18n-content="cannotBeBlank">
                             </div>
                             <div id="errormsg-1-password" class="errormsg">
-                              <span i18n-content="invalidcredentials"></span>
+                              <span i18n-content="invalidCredentials"></span>
                               <!-- Brackets are intentional -->
-                              [<a i18n-values="href:invalidpasswordhelpurl"
+                              [<a i18n-values="href:invalidPasswordHelpURL"
                                    target="_blank">?</a>]
                             </div>
                             <div id="errormsg-0-access-code" class="errormsg"
-                                i18n-content="invalidaccesscode">
+                                i18n-content="invalidAccessCode">
                             </div>
                           </div>
                         </td>
@@ -109,7 +109,7 @@
                         <td colspan="2">
                           <div id="captcha-div">
                             <div id="captcha-instructions"
-                                i18n-content="captchainstructions"
+                                i18n-content="captchaInstructions"
                                 class="bottom-padded-cell">
                             </div>
                             <div class="bottom-padded-cell">
@@ -127,7 +127,7 @@
                       <tr>
                         <td colspan="2" align="center">
                           <div id="errormsg-0-connection" class="errormsg"
-                              i18n-content="couldnotconnect">
+                              i18n-content="couldNotConnect">
                           </div>
                         </td>
                       </tr>
@@ -152,9 +152,9 @@
                       <tr id="ga-fprow">
                         <td colspan="2" height="16.0"
                             align="center" valign="bottom">
-                          <a i18n-values="href:cannotaccessaccounturl"
+                          <a i18n-values="href:cannotAccessAccountURL"
                               target="_blank"
-                              i18n-content="cannotaccessaccount">
+                              i18n-content="cannotAccessAccount">
                           </a>
                         </td>
                       </tr>
@@ -162,8 +162,8 @@
                         <td id="create-account-cell" colspan="2" height="16.0"
                             align="center" valign="bottom">
                           <div id="create-account-div">
-                            <a i18n-values="href:createnewaccounturl"
-                                i18n-content="createaccount" target="_blank">
+                            <a i18n-values="href:createNewAccountURL"
+                                i18n-content="createAccount" target="_blank">
                             </a>
                           </div>
                        </td>
@@ -192,8 +192,8 @@
     <div id="confirm-sync-preferences">
       <h1 i18n-content="confirmSyncPreferences"></h1>
       <div id="sync-instructions-container" class="content-area">
-        <span i18n-content="choosedatatypesinstructions"></span>
-        <a i18n-values="href:encryptionhelpurl" target="_blank"
+        <span i18n-content="chooseDataTypesInstructions"></span>
+        <a i18n-values="href:encryptionHelpURL" target="_blank"
             i18n-content="learnMore"></a>
       </div>
       <div>
@@ -216,8 +216,8 @@
         <div id="sync-configure-content" class="content-area">
           <div id="sync-select-container">
             <select id="sync-select-datatypes">
-              <option i18n-content="keepeverythingsynced" selected></option>
-              <option i18n-content="choosedatatypes"></option>
+              <option i18n-content="keepEverythingSynced" selected></option>
+              <option i18n-content="chooseDataTypes"></option>
             </select>
             <div id="choose-data-types-body">
               <div>
@@ -250,8 +250,8 @@
                 <div id="omnibox-item" class="sync-item-show">
                   <input id="typed-urls-checkbox" type="checkbox"
                       name="dataTypeCheckbox">
-                  <label for="typed-urls-checkbox" i18n-content="typedurls"
-                      i18n-values="title:typedurls" name="dataTypeLabel">
+                  <label for="typed-urls-checkbox" i18n-content="typedURLs"
+                      i18n-values="title:typedURLs" name="dataTypeLabel">
                   </label>
                 </div>
                 <div id="passwords-item" class="sync-item-show">
@@ -277,16 +277,16 @@
                 <div id="sessions-item" class="sync-item-show">
                   <input id="sessions-checkbox" type="checkbox"
                       name="dataTypeCheckbox">
-                  <label for="sessions-checkbox" i18n-content="foreignsessions"
+                  <label for="sessions-checkbox" i18n-content="foreignSessions"
                       il8n-values="title:sessions" name="dataTypeLabel"></label>
                 </div>
               </div>
             </div>
           </div>
           <div class="sync-errors">
-            <span id="error-text" i18n-content="synczerodatatypeserror"
+            <span id="error-text" i18n-content="syncZeroDataTypesError"
                 class="sync-error-hide"></span>
-            <span id="aborted-text" i18n-content="abortederror"
+            <span id="aborted-text" i18n-content="abortedError"
                 class="sync-error-hide"></span>
           </div>
           <hr>
@@ -304,7 +304,7 @@
                   value="explicit">
               <label for="explicit-option" i18n-content="explicitOption">
               </label>
-              <a i18n-values="href:encryptionhelpurl" target="_blank"
+              <a i18n-values="href:encryptionHelpURL" target="_blank"
                   i18n-content="learnMore"></a>
             </div>
             <div id="sync-custom-passphrase" hidden>
@@ -364,7 +364,7 @@
         </div>
         <span id="sync-passphrase-warning" i18n-content="passphraseRecover">
         </span> <a href="http://google.com/dashboard" target="_blank"
-            i18n-content="cleardatalink"></a>
+            i18n-content="clearDataLink"></a>
         <div id="cancel-warning-box" class="overlay-warning" hidden>
           <div id="cancel-warning-header" i18n-content="cancelWarningHeader">
           </div>
diff --git a/chrome/browser/resources/options/sync_setup_overlay.js b/chrome/browser/resources/options/sync_setup_overlay.js
index 191e76d..943f3b4 100644
--- a/chrome/browser/resources/options/sync_setup_overlay.js
+++ b/chrome/browser/resources/options/sync_setup_overlay.js
@@ -632,7 +632,7 @@ cr.define('options', function() {
     },
 
     showSuccessAndSettingUp_: function() {
-      $('sign-in').value = localStrings.getString('settingup');
+      $('sign-in').value = localStrings.getString('settingUp');
     },
 
     /** @inheritDoc */
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc
index c6fc9f7..ca4d242 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc
@@ -163,20 +163,20 @@ void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   localized_strings->SetString(
-      "invalidpasswordhelpurl",
+      "invalidPasswordHelpURL",
       google_util::StringAppendGoogleLocaleParam(kInvalidPasswordHelpUrl));
   localized_strings->SetString(
-      "cannotaccessaccounturl",
+      "cannotAccessAccountURL",
       google_util::StringAppendGoogleLocaleParam(kCanNotAccessAccountUrl));
   localized_strings->SetString(
-      "createnewaccounturl",
+      "createNewAccountURL",
       google_util::StringAppendGoogleLocaleParam(kCreateNewAccountUrl));
   localized_strings->SetString(
       "introduction",
       GetStringFUTF16(IDS_SYNC_LOGIN_INTRODUCTION,
                       GetStringUTF16(IDS_PRODUCT_NAME)));
   localized_strings->SetString(
-      "choosedatatypesinstructions",
+      "chooseDataTypesInstructions",
       GetStringFUTF16(IDS_SYNC_CHOOSE_DATATYPES_INSTRUCTIONS,
                       GetStringUTF16(IDS_PRODUCT_NAME)));
   localized_strings->SetString(
@@ -184,7 +184,7 @@ void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
       GetStringFUTF16(IDS_SYNC_ENCRYPTION_INSTRUCTIONS,
                       GetStringUTF16(IDS_PRODUCT_NAME)));
   localized_strings->SetString(
-      "encryptionhelpurl",
+      "encryptionHelpURL",
       google_util::StringAppendGoogleLocaleParam(kEncryptionHelpUrl));
   localized_strings->SetString(
       "passphraseEncryptionMessage",
@@ -194,41 +194,39 @@ void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
   static OptionsStringResource resources[] = {
     { "syncSetupOverlayTitle", IDS_SYNC_SETUP_TITLE },
     { "syncSetupConfigureTitle", IDS_SYNC_SETUP_CONFIGURE_TITLE },
-    { "signinprefix", IDS_SYNC_LOGIN_SIGNIN_PREFIX },
-    { "signinsuffix", IDS_SYNC_LOGIN_SIGNIN_SUFFIX },
-    { "cannotbeblank", IDS_SYNC_CANNOT_BE_BLANK },
-    { "emaillabel", IDS_SYNC_LOGIN_EMAIL },
-    { "passwordlabel", IDS_SYNC_LOGIN_PASSWORD },
-    { "invalidcredentials", IDS_SYNC_INVALID_USER_CREDENTIALS },
+    { "signinPrefix", IDS_SYNC_LOGIN_SIGNIN_PREFIX },
+    { "signinSuffix", IDS_SYNC_LOGIN_SIGNIN_SUFFIX },
+    { "cannotBeBlank", IDS_SYNC_CANNOT_BE_BLANK },
+    { "emailLabel", IDS_SYNC_LOGIN_EMAIL },
+    { "passwordLabel", IDS_SYNC_LOGIN_PASSWORD },
+    { "invalidCredentials", IDS_SYNC_INVALID_USER_CREDENTIALS },
     { "signin", IDS_SYNC_SIGNIN },
-    { "couldnotconnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT },
-    { "cannotaccessaccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT },
-    { "createaccount", IDS_SYNC_CREATE_ACCOUNT },
+    { "couldNotConnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT },
+    { "cannotAccessAccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT },
+    { "createAccount", IDS_SYNC_CREATE_ACCOUNT },
     { "cancel", IDS_CANCEL },
-    { "settingup", IDS_SYNC_LOGIN_SETTING_UP },
-    { "settingupsync", IDS_SYNC_LOGIN_SETTING_UP_SYNC },
-    { "errorsigningin", IDS_SYNC_ERROR_SIGNING_IN },
-    { "captchainstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS },
-    { "invalidaccesscode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL },
-    { "enteraccesscode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL },
-    { "getaccesscodehelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL },
-    { "getaccesscodeurl", IDS_SYNC_GET_ACCESS_CODE_URL },
+    { "settingUp", IDS_SYNC_LOGIN_SETTING_UP },
+    { "errorSigningIn", IDS_SYNC_ERROR_SIGNING_IN },
+    { "captchaInstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS },
+    { "invalidAccessCode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL },
+    { "enterAccessCode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL },
+    { "getAccessCodeHelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL },
+    { "getAccessCodeURL", IDS_SYNC_GET_ACCESS_CODE_URL },
     { "dataTypes", IDS_SYNC_DATA_TYPES_TAB_NAME },
     { "encryption", IDS_SYNC_ENCRYPTION_TAB_NAME },
-    { "choosedatatypesheader", IDS_SYNC_CHOOSE_DATATYPES_HEADER },
-    { "keepeverythingsynced", IDS_SYNC_EVERYTHING },
-    { "choosedatatypes", IDS_SYNC_CHOOSE_DATATYPES },
+    { "keepEverythingSynced", IDS_SYNC_EVERYTHING },
+    { "chooseDataTypes", IDS_SYNC_CHOOSE_DATATYPES },
     { "bookmarks", IDS_SYNC_DATATYPE_BOOKMARKS },
     { "preferences", IDS_SYNC_DATATYPE_PREFERENCES },
     { "autofill", IDS_SYNC_DATATYPE_AUTOFILL },
     { "themes", IDS_SYNC_DATATYPE_THEMES },
     { "passwords", IDS_SYNC_DATATYPE_PASSWORDS },
     { "extensions", IDS_SYNC_DATATYPE_EXTENSIONS },
-    { "typedurls", IDS_SYNC_DATATYPE_TYPED_URLS },
+    { "typedURLs", IDS_SYNC_DATATYPE_TYPED_URLS },
     { "apps", IDS_SYNC_DATATYPE_APPS },
-    { "foreignsessions", IDS_SYNC_DATATYPE_SESSIONS },
-    { "synczerodatatypeserror", IDS_SYNC_ZERO_DATA_TYPES_ERROR },
-    { "abortederror", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR },
+    { "foreignSessions", IDS_SYNC_DATATYPE_SESSIONS },
+    { "syncZeroDataTypesError", IDS_SYNC_ZERO_DATA_TYPES_ERROR },
+    { "abortedError", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR },
     { "encryptAllLabel", IDS_SYNC_ENCRYPT_ALL_LABEL },
     { "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE },
     { "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT },
@@ -239,12 +237,7 @@ void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
     { "emptyErrorMessage", IDS_SYNC_EMPTY_PASSPHRASE_ERROR },
     { "mismatchErrorMessage", IDS_SYNC_PASSPHRASE_MISMATCH_ERROR },
     { "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING },
-    { "cleardata", IDS_SYNC_CLEAR_DATA_FOR_PASSPHRASE },
-    { "cleardatalink", IDS_SYNC_CLEAR_DATA_LINK },
-    { "settingup", IDS_SYNC_LOGIN_SETTING_UP },
-    { "success", IDS_SYNC_SUCCESS },
-    { "firsttimesummary", IDS_SYNC_SETUP_FIRST_TIME_ALL_DONE },
-    { "okay", IDS_SYNC_SETUP_OK_BUTTON_LABEL },
+    { "clearDataLink", IDS_SYNC_CLEAR_DATA_LINK },
     { "enterPassphraseTitle", IDS_SYNC_ENTER_PASSPHRASE_TITLE },
     { "firstPassphraseTitle", IDS_SYNC_FIRST_PASSPHRASE_TITLE },
     { "customizeLinkLabel", IDS_SYNC_CUSTOMIZE_LINK_LABEL },
@@ -260,7 +253,6 @@ void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
     { "incorrectPassphrase", IDS_SYNC_INCORRECT_PASSPHRASE },
     { "passphraseRecover", IDS_SYNC_PASSPHRASE_RECOVER },
     { "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING },
-    { "cleardatalink", IDS_SYNC_CLEAR_DATA_LINK },
     { "cancelWarningHeader", IDS_SYNC_PASSPHRASE_CANCEL_WARNING_HEADER },
     { "cancelWarning", IDS_SYNC_PASSPHRASE_CANCEL_WARNING },
     { "yes", IDS_SYNC_PASSPHRASE_CANCEL_YES },
@@ -295,7 +287,6 @@ void SyncSetupHandler::RegisterMessages() {
       NewCallback(this, &SyncSetupHandler::HandleGoToDashboard));
 }
 
-// Called by SyncSetupFlow::Advance.
 void SyncSetupHandler::ShowGaiaLogin(const DictionaryValue& args) {
   StringValue page("login");
   web_ui_->CallJavascriptFunction(
@@ -310,7 +301,6 @@ void SyncSetupHandler::ShowGaiaSuccessAndSettingUp() {
   web_ui_->CallJavascriptFunction("SyncSetupOverlay.showSuccessAndSettingUp");
 }
 
-// Called by SyncSetupFlow::Advance.
 void SyncSetupHandler::ShowConfigure(const DictionaryValue& args) {
   StringValue page("configure");
   web_ui_->CallJavascriptFunction(