diff options
author | sschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 18:00:16 +0000 |
---|---|---|
committer | sschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 18:00:16 +0000 |
commit | 2cb73c9390ec2af9ebf0f3b2f6be129d1a032767 (patch) | |
tree | 29d48af2034e055325c5f747b7184643bfaa36e6 /ash/ash_strings.grd | |
parent | dc1cb7d8b1fc1a92a7ad22cf92316a0338787f5f (diff) | |
download | chromium_src-2cb73c9390ec2af9ebf0f3b2f6be129d1a032767.zip chromium_src-2cb73c9390ec2af9ebf0f3b2f6be129d1a032767.tar.gz chromium_src-2cb73c9390ec2af9ebf0f3b2f6be129d1a032767.tar.bz2 |
Unify and change logout/sleep/lock shortcuts
New behavior: User must press Ctrl-Shift-Q twice to exit (within time limit).
Removed the "exit on long hold" behavior. The popup indicates:
"Press Ctrl+Shift+Q twice to quit."
Also, turned off subpixel rendering for the popup label text per request.
BUG=225903
R=sky@chromium.org
TEST=manual
out/Debug/ash_unittests --gtest_filter='AcceleratorControllerTest.ExitWarningHandlerTest*'
Review URL: https://chromiumcodereview.appspot.com/15530003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_strings.grd')
-rw-r--r-- | ash/ash_strings.grd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd index 5da716d..ca15ef7 100644 --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd @@ -510,7 +510,7 @@ Press Shift + Alt to switch. Failed to save screenshot </message> <message name="IDS_ASH_EXIT_WARNING_POPUP_TEXT" desc="The text of the popup when the user preses the exit shortcut."> - Hold Ctrl+Shift+Q to quit. + Press Ctrl+Shift+Q twice to quit. </message> <!-- ChromeOS-specific strings --> |