Put the signin error's "Learn More" link on its own line.

BUG=651933 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Review-Url: https://codereview.chromium.org/2387123002 Cr-Commit-Position: refs/heads/master@{#422959}

Put the signin error's "Learn More" link on its own line.
BUG=651933 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Review-Url: https://codereview.chromium.org/2387123002 Cr-Commit-Position: refs/heads/master@{#422959}
472ffbb2 · anthonyvd · Commit bot · d1a865ba · 472ffbb2 · 472ffbb2
Commit 472ffbb2 authored Oct 04, 2016 by anthonyvd Committed by Commit bot Oct 04, 2016
3 changed files
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11236,7 +11236,7 @@ I don't think this site should be blocked!
        Can't sign in to <ph name="USERNAME">$1<ex>Jane.Doe@gmail.com</ex></ph>
      </message>
      <message name="IDS_SIGNIN_ERROR_LEARN_MORE_LINK" desc="Label in the signin error tab modal dialog containing the link to go to the Chrome Help page for sync problems.">
-        <ph name="SIGNIN_ERROR">$1<ex>Signing in with this username has been disabled by your administrator.</ex></ph> <ph name="BEGIN_LINK">&lt;a id="learnMoreLink" href="#"&gt;Learn more&lt;/a&gt;</ph>
+        Learn more
      </message>
      <message name="IDS_SIGNIN_ERROR_CLOSE_BUTTON_LABEL" desc="Label of the Close button in the signin error dialog.">
        Close

--- a/chrome/browser/resources/signin/signin_error/signin_error.html
+++ b/chrome/browser/resources/signin/signin_error/signin_error.html
@@ -32,7 +32,10 @@
  <body>
    <div class="container">
      <div class="top-title-bar">$i18n{signinErrorTitle}</div>
-      <div class="details">$i18nRaw{signinErrorMessage}</div>
+      <div class="details">
+        <p>$i18nRaw{signinErrorMessage}</p>
+        <a id="learnMoreLink" href="#">$i18nRaw{signinErrorLearnMore}</a>
+      </div>
      <div class="action-container">
        <paper-button class="primary-action" id="switchButton">
          $i18n{signinErrorSwitchLabel}

--- a/chrome/browser/ui/webui/signin/signin_error_ui.cc
+++ b/chrome/browser/ui/webui/signin/signin_error_ui.cc
@@ -97,23 +97,21 @@ SigninErrorUI::SigninErrorUI(content::WebUI* web_ui,
    DCHECK(!existing_name.empty());
    source->AddString(
        "signinErrorMessage",
-        l10n_util::GetStringFUTF16(
+        l10n_util::GetStringFUTF16(IDS_SYNC_USER_NAME_IN_USE_BY_ERROR,
-            IDS_SIGNIN_ERROR_LEARN_MORE_LINK,
+                                   existing_name));
-            l10n_util::GetStringFUTF16(IDS_SYNC_USER_NAME_IN_USE_BY_ERROR,
-                                       existing_name)));
    // Elide the existing name for the switch user button label.
    existing_name =
        gfx::TruncateString(existing_name, 10, gfx::CHARACTER_BREAK);
  } else {
-    source->AddString("signinErrorMessage",
+    source->AddString("signinErrorMessage", last_login_result);
-                      l10n_util::GetStringFUTF16(
-                          IDS_SIGNIN_ERROR_LEARN_MORE_LINK, last_login_result));
  }
  // Add button label strings.
  source->AddString("signinErrorSwitchLabel",
                    l10n_util::GetStringFUTF16(
                        IDS_SIGNIN_ERROR_SWITCH_BUTTON_LABEL, existing_name));
+  source->AddLocalizedString("signinErrorLearnMore",
+                             IDS_SIGNIN_ERROR_LEARN_MORE_LINK);
  source->AddLocalizedString("signinErrorCloseLabel",
                             IDS_SIGNIN_ERROR_CLOSE_BUTTON_LABEL);
  source->AddLocalizedString("signinErrorOkLabel",