summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 16:00:09 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 16:00:09 +0000
commit73bd67befcb568d52b04984ec9cb75bf216df6c1 (patch)
treeea81be9a4c8036cbe04e8cc28f05f145eb63d70f /chrome/app
parent99739afe82bfcda375aca9c95ab1f69f483b240d (diff)
downloadchromium_src-73bd67befcb568d52b04984ec9cb75bf216df6c1.zip
chromium_src-73bd67befcb568d52b04984ec9cb75bf216df6c1.tar.gz
chromium_src-73bd67befcb568d52b04984ec9cb75bf216df6c1.tar.bz2
Initial accounts options page.
- Add a "Accounts" subpage for ChromeOS; - Two checkboxes for allowing BWSI and allowing guest signin; - Make measureItem in list.js returns 0 instead of -1. The itemHeight is -1 when the list is not visible. And 0 will let redraw to call measureItem again; - Add an onVisibilityChanged callback that is called when "visible" property is changed; And use that to trigger user list's redraw; - Use a mock settings object so that the UI flow could be tested; - Update options_page.css to add a few css missed from dhg's overlay cl; BUG=chromium-os:4734 TEST=None. This is a draft version and will be changed after UX feedbacks. Review URL: http://codereview.chromium.org/2935011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd24
1 files changed, 22 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2de6bcc..06d1d58 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5459,7 +5459,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_LABS_TAB_LABEL" desc="The title of the LABS tab">
Labs
</message>
-
+ <message name="IDS_OPTIONS_ACCOUNTS_TAB_LABEL" desc="The title of the Accounts tab">
+ Accounts
+ </message>
</if>
<message name="IDS_OPTIONS_GENERAL_TAB_LABEL" desc="The title of the Basics tab">
Basics
@@ -7704,7 +7706,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
<message name="IDS_LOGIN_PASSWORD_CHANGED_DESC" desc="Detailed description of the password changed dialog">
Your Google Account password has changed since the last time you signed in on this computer.
- </message>
+ </message>
<message name="IDS_LOGIN_PASSWORD_CHANGED_RESET" desc="Reset option of the password changed dialog">
Synchronize all settings and data\n(may take some time)
</message>
@@ -7819,6 +7821,24 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_SETTINGS_OTHER_NETWORKS" desc="In the settings tab, the text on the button to display other networks.">
Other...
</message>
+ <message name="IDS_OPTIONS_ACCOUNTS_ALLOW_BWSI_DESCRIPTION" desc="In the Accounts settings tab, the text on the checkbox to allow browse without signing in.">
+ Allow browse without signing in.
+ </message>
+ <message name="IDS_OPTIONS_ACCOUNTS_ALLOW_GUEST_DESCRIPTION" desc="In the Accounts settings tab, the text on the checkbox to allow guest to sign in.">
+ Allow guest signin.
+ </message>
+ <message name="IDS_OPTIONS_ACCOUNTS_USER_LIST_TITLE" desc="In the Accounts settings tab, the title text on top of user list table.">
+ Users
+ </message>
+ <message name="IDS_OPTIONS_ACCOUNTS_ADD_USER" desc="In the Accounts settings tab, the text on the button to add a user.">
+ Add user
+ </message>
+ <message name="IDS_OPTIONS_ACCOUNTS_REMOVE_USER" desc="In the Accounts settings tab, the text on the button to remove a user.">
+ Remove user
+ </message>
+ <message name="IDS_OPTIONS_ACCOUNTS_EMAIL_LABEL" desc="In the Accounts add user overlay, the label text for email input edit.">
+ Email:
+ </message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID" desc="In settings internet options, the label for the network id.">
Network id:
</message>