diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 09:09:41 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 09:09:41 +0000 |
| commit | c8d19f8b527b6e731cc88d89574dc9127e9a62ac (patch) | |
| tree | 03f18eeb52be5315dea606cb5756ad3e32429170 /ash/ash_strings.grd | |
| parent | e519c435d39e453f532b1ba352ad2944c75895d8 (diff) | |
| download | chromium_src-c8d19f8b527b6e731cc88d89574dc9127e9a62ac.zip chromium_src-c8d19f8b527b6e731cc88d89574dc9127e9a62ac.tar.gz chromium_src-c8d19f8b527b6e731cc88d89574dc9127e9a62ac.tar.bz2 | |
Adding new user menu section to the SystemTrayMenu & refactoring of user access
It is still not fully finished - but it is functional and might be useful for what you are doing (and already quite big as it is). Note that the functionality is controlled by the flag.
What is missing?
- There are no unit tests yet
- The visual Drop down box to add a new user is missing.
- The error message box which shows the error if there are already 3 users signed in is missing.
- At the moment I have ~7 lines of test code in there which I will remove before I check in. (I need them since the multi login still does not work for me)
I am not sure if you want to wait until I finish the issue - or if you'd rather want to have this to be able to rather merge early then later. I leave this up to you. If you are for the latter one, you can have at least a look at my changes and if they conflict with yours.
BUG=239201
TEST=visual
Review URL: https://chromiumcodereview.appspot.com/14756019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_strings.grd')
| -rw-r--r-- | ash/ash_strings.grd | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd index 2ea0cf8..5da716d 100644 --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd @@ -218,6 +218,9 @@ Press Ctrl+Alt+Z to disable. <message name="IDS_ASH_STATUS_TRAY_SIGN_OUT" desc="The label used for the button in the status tray to sign out of the system."> Sign out </message> + <message name="IDS_ASH_STATUS_TRAY_SIGN_OUT_ALL" desc="The label used for the button in the status tray to sign out all users of the system."> + Sign out all + </message> <message name="IDS_ASH_STATUS_TRAY_GUEST_LABEL" desc="The label used in the system tray's user card to indicate that the current session is a guest session."> Guest </message> @@ -248,6 +251,15 @@ Press Ctrl+Alt+Z to disable. <message name="IDS_ASH_STATUS_TRAY_SMS_NUMBER" desc="Sender for SMS messagees in the system tray."> SMS from <ph name="PHONE_NUMBER">$1<ex>08700 776655</ex></ph> </message> + <message name="IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT" desc="The string for the button which lets the user add another account to the current session."> + Sign in another account... + </message> + <message name="IDS_ASH_STATUS_TRAY_CAPTION_CANNOT_ADD_USER" desc="The caption for the error message when the user has reached the limit of multi profile users."> + Can't sign into another account. + </message> + <message name="IDS_ASH_STATUS_TRAY_MESSAGE_CANNOT_ADD_USER" desc="The error message when the user has reached the limit of multi profile users."> + You can only have up to three accounts in multiple sign-in. + </message> <message name="IDS_ASH_STATUS_TRAY_BLUETOOTH" desc="The label used as the header in the bluetooth popup."> Bluetooth |