Make tweaks to password UI following today's UI review: added a learn more...

Make tweaks to password UI following today's UI review: added a learn more link on the encryption tab and reduced the amount of text slightly.  Made the dialog slightly taller so that everything fits more comfortably without the risk of overlapping elements.

BUG=69624
TEST=none

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

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

chrome/app/generated_resources.grd

@@ -8142,7 +8142,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
         You have chosen to encrypt data using your Google password; you can always change your mind later by changing your sync settings.
       </message>
       <message name="IDS_SYNC_PASSPHRASE_MSG_EXPLICIT" desc="Message when explicit passphrase is selected.">
-        Only someone with your passphrase can read your data. Google does not store your passphrase. If you forget your passphrase, you will need to reset sync.
+        Only someone with your passphrase can read your data. If you forget your passphrase, you will need to reset sync.
       </message>
       <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.
@@ -8302,7 +8302,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Enter your passphrase
       </message>
       <message name="IDS_SYNC_ENTER_PASSPHRASE_BODY" desc="Instructions for the dialog where the user enters the passphrase.">
-        You already have data that is encrypted with a custom passphrase, please enter it below.
+        You already have data that is encrypted with a custom passphrase. Please enter it below.
       </message>
       <message name="IDS_SYNC_ENTER_OTHER_PASSPHRASE_BODY" desc="Instructions for the dialog where the user needs to enter a different passphrase.">
         The passphrase you entered can't be used because you already have data encrypted with a custom passphrase. Please enter your existing passphrase below.

chrome/app/resources/locale_settings.grd

@@ -496,7 +496,7 @@
 
       <!-- The height of the sync setup wizard / login dialog in lines. -->
       <message name="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES" use_name_for_id="true">
-        15
+        16
       </message>
 
       <message name="IDS_SYNC_GET_ACCESS_CODE_URL" translateable="false">

chrome/browser/sync/resources/configure.html

@@ -145,7 +145,7 @@ form {
 }
 .sync-section {
   background: #EEE;
-  margin: 5px 0px;
+  margin: 5px 0px 5px 19px;
   padding: 6px;
 }
 
@@ -153,6 +153,10 @@ form {
   margin-bottom: 5px;
 }
 
+#learn-more-link {
+  float: right;
+}
+
 #change-passphrase {
   margin: 10px 0;
   background: #EEE;
@@ -568,6 +572,10 @@ html[os='mac'] input[type='submit'] {
     <div>
       <input id="explicit-option" name="option" type="radio"
              value="explicit" onchange="onRadioChange();">
+      <div id="learn-more-link">
+        <a i18n-values="href:encryptionhelpurl" target="_blank"
+           i18n-content="learnmore"></a>
+      </div>
       <span i18n-content="explicitOption"></span>
     </input>
     </div>

chrome/browser/sync/sync_setup_wizard.cc

@@ -51,6 +51,7 @@ class SyncResourcesSource : public ChromeURLDataManager::DataSource {
   static const char* kInvalidPasswordHelpUrl;
   static const char* kCanNotAccessAccountUrl;
   static const char* kCreateNewAccountUrl;
+  static const char* kEncryptionHelpUrl;
 
  private:
   virtual ~SyncResourcesSource() {}
@@ -64,11 +65,13 @@ class SyncResourcesSource : public ChromeURLDataManager::DataSource {
 };
 
 const char* SyncResourcesSource::kInvalidPasswordHelpUrl =
-  "http://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444";
+    "http://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444";
 const char* SyncResourcesSource::kCanNotAccessAccountUrl =
-  "http://www.google.com/support/accounts/bin/answer.py?answer=48598";
+    "http://www.google.com/support/accounts/bin/answer.py?answer=48598";
+const char* SyncResourcesSource::kEncryptionHelpUrl =
+    "http://www.google.com/support/chrome/bin/answer.py?answer=165139";
 const char* SyncResourcesSource::kCreateNewAccountUrl =
-  "https://www.google.com/accounts/NewAccount?service=chromiumsync";
+    "https://www.google.com/accounts/NewAccount?service=chromiumsync";
 
 void SyncResourcesSource::StartDataRequest(const std::string& path_raw,
     bool is_off_the_record, int request_id) {
@@ -164,6 +167,10 @@ void SyncResourcesSource::StartDataRequest(const std::string& path_raw,
     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, "ok", IDS_OK);
     AddString(dict, "cancel", IDS_CANCEL);