summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 21:23:19 +0000
committerrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 21:23:19 +0000
commitaf11c4aa1717b2b7cc23cad104ef18429c7bf496 (patch)
tree78a009c77d2306a7917c1caa79de1f3e58aaf854
parentdc119198eba2bf594fb21c2b31c3f61c786e5b64 (diff)
downloadchromium_src-af11c4aa1717b2b7cc23cad104ef18429c7bf496.zip
chromium_src-af11c4aa1717b2b7cc23cad104ef18429c7bf496.tar.gz
chromium_src-af11c4aa1717b2b7cc23cad104ef18429c7bf496.tar.bz2
Auto-login UI polish.
BUG=98873 TEST=See bug description for UI changes Review URL: http://codereview.chromium.org/8177006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104565 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd4
-rw-r--r--chrome/browser/resources/options/personal_options.css4
-rw-r--r--chrome/browser/resources/options/personal_options.html14
3 files changed, 13 insertions, 9 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index f2a0306..545610f 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7777,7 +7777,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
</if>
<message name="IDS_OPTIONS_PASSWORDS_AUTOLOGIN" desc="The label of the 'autologinEnabled' checkbox">
- Enable automatic sign in for Google sites
+ Offer to sign into Google sites automatically with this account
</message>
<if expr="not pp_ifdef('use_titlecase')">
<message name="IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME" desc="The title of the form Autofill group">
@@ -8301,7 +8301,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<!-- Auto-login infobar -->
<message name="IDS_AUTOLOGIN_INFOBAR_MESSAGE" desc="The string shown in the infobar explaining that they can press one button to auto-login instead of entering their user name and password.">
- Sign in to this site using: <ph name="EMAIL_ADDRESS">$1</ph>
+ Sign in to this site as: <ph name="EMAIL_ADDRESS">$1</ph>
</message>
<message name="IDS_AUTOLOGIN_INFOBAR_OK_BUTTON" desc="The string used in the infobar button that the user presses to perform the auto-login.">
Sign in
diff --git a/chrome/browser/resources/options/personal_options.css b/chrome/browser/resources/options/personal_options.css
index ab18284..2fc9437 100644
--- a/chrome/browser/resources/options/personal_options.css
+++ b/chrome/browser/resources/options/personal_options.css
@@ -41,3 +41,7 @@
margin: 0 1ex;
padding: 0;
}
+
+#enable-auto-login-checkbox {
+ margin-top: 10px;
+}
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index 59ff5a7..51aca5e 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -33,6 +33,13 @@
<button id="start-stop-sync" hidden></button>
<button id="customize-sync" i18n-content="customizeSync" hidden>
</button>
+ <div id="enable-auto-login-checkbox" class="checkbox" hidden>
+ <label>
+ <input id="enable-auto-login" pref="autologin.enabled"
+ metric="Options_Autologin" type="checkbox">
+ <span i18n-content="autologinEnabled"></span>
+ </label>
+ </div>
</div>
</div>
</section>
@@ -76,13 +83,6 @@
configured by the IT administrator. -->
<input name="password_allow_show_hidden" type="text"
pref="profile.password_manager_allow_show_passwords" hidden>
- <div class="checkbox" id="enable-auto-login-checkbox" hidden>
- <label>
- <input id="enable-auto-login" pref="autologin.enabled"
- metric="Options_Autologin" type="checkbox">
- <span i18n-content="autologinEnabled"></span>
- </label>
- </div>
</div>
</section>
<section id="autofill-section">