diff options
author | akuegel@chromium.org <akuegel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 09:37:35 +0000 |
---|---|---|
committer | akuegel@chromium.org <akuegel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 09:37:35 +0000 |
commit | a2540e99f5d80f42fd7b0742c71cc77980019a56 (patch) | |
tree | f4a9d868ef67e75867d9565b0309dfa121772c4f /chrome/app/generated_resources.grd | |
parent | 726229e9bb85c7c1f1a1872eb2221751280b7e53 (diff) | |
download | chromium_src-a2540e99f5d80f42fd7b0742c71cc77980019a56.zip chromium_src-a2540e99f5d80f42fd7b0742c71cc77980019a56.tar.gz chromium_src-a2540e99f5d80f42fd7b0742c71cc77980019a56.tar.bz2 |
History: Add lock/unlock button to the history page.
These buttons will only be visible if the profile of the
user is managed. The Unlock button is visible if the managed
user is currently not in elevated state, the Lock button is
visible if the managed user is in elevated state.
Clicking such a button toggles the elevation state. Clicking
the unlock button opens a passphrase dialog, and only if the
authentication is successful, the managed user is set in
elevated state.
Here are screenshots for a managed user in elevated state
(history_unlocked.png) and not in elevated state
(history_locked.png):
https://drive.google.com/a/google.com/folderview?id=0BzMCIwDgeNezazRYa3lpbkxCdnM&usp=sharing
BUG=171370
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/12340004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/generated_resources.grd')
-rw-r--r-- | chrome/app/generated_resources.grd | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index a873449..e47a84d 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -483,6 +483,12 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may <message name="IDS_HISTORY_IN_CONTENT_PACK" desc="Text that shows that an entry is in a content pack."> In content pack </message> + <message name="IDS_HISTORY_UNLOCK_BUTTON" desc="The text on the button that is used by a managed user to unlock the controls."> + Unlock + </message> + <message name="IDS_HISTORY_LOCK_BUTTON" desc="The text on the button that is used by a managed user to lock the controls."> + Lock + </message> <!-- Generic terms --> <message name="IDS_OK" desc="Used for OK on buttons"> |