diff options
| author | sschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 08:48:03 +0000 |
|---|---|---|
| committer | sschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 08:48:03 +0000 |
| commit | 059c8d351d5083744525c595110f730081cf5280 (patch) | |
| tree | 249e08b2fbbe8ff215b17ee21eb59d902598e527 /ash/ash_strings.grd | |
| parent | e9304b9fefc5deeeaa99363945ab7dd1bd6260be (diff) | |
| download | chromium_src-059c8d351d5083744525c595110f730081cf5280.zip chromium_src-059c8d351d5083744525c595110f730081cf5280.tar.gz chromium_src-059c8d351d5083744525c595110f730081cf5280.tar.bz2 | |
Unify and change logout/sleep/lock shortcuts
This CL implements an exit warning and requires the user to hold
the exit shortcut for a while, before actually exiting. This is
to prevent accidental exits due shortcut mistakes.
Expert user can exit quickly with a double press.
BUG=225903
R=sky@chromium.org
TEST=manual
out/Debug/ash_unittests --gtest_filter='AcceleratorControllerTest.ExitWarningHandlerTest*'
Review URL: https://chromiumcodereview.appspot.com/14587007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_strings.grd')
| -rw-r--r-- | ash/ash_strings.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd index b4b7177..4d850cf 100644 --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd @@ -494,6 +494,9 @@ Press Shift + Alt to switch. <message name="IDS_ASH_SCREENSHOT_NOTIFICATION_TEXT_FAIL" desc="The text of the notification when taking a screenshot failed."> 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. + </message> <!-- ChromeOS-specific strings --> <if expr="pp_ifdef('chromeos')"> |