Skip to content

Commit

Permalink
When using the quit/sign out shortcut (ctrl-shift-q) on chrome-os dis…
Browse files Browse the repository at this point in the history
…play the string "... to sign out" instead of "... to quit"

BUG=365166

Review URL: https://codereview.chromium.org/275243003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270032 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
harrym@chromium.org committed May 13, 2014
1 parent ad14a63 commit e8b4812
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions ash/accelerators/exit_warning_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,15 @@ class ExitWarningLabel : public views::Label {
class ExitWarningWidgetDelegateView : public views::WidgetDelegateView {
public:
ExitWarningWidgetDelegateView() : text_width_(0), width_(0), height_(0) {
#ifdef OS_CHROMEOS
text_ = l10n_util::GetStringUTF16(IDS_ASH_SIGN_OUT_WARNING_POPUP_TEXT);
accessible_name_ = l10n_util::GetStringUTF16(
IDS_ASH_SIGN_OUT_WARNING_POPUP_TEXT_ACCESSIBLE);
#else
text_ = l10n_util::GetStringUTF16(IDS_ASH_EXIT_WARNING_POPUP_TEXT);
accessible_name_ =
l10n_util::GetStringUTF16(IDS_ASH_EXIT_WARNING_POPUP_TEXT_ACCESSIBLE);
#endif
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
const gfx::FontList& font_list =
rb.GetFontList(ui::ResourceBundle::LargeFont);
Expand Down
6 changes: 6 additions & 0 deletions ash/ash_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,12 @@ 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_SIGN_OUT_WARNING_POPUP_TEXT" desc="The text of the popup when the user preses the exit shortcut in chrome-os.">
Press Ctrl+Shift+Q twice to sign out.
</message>
<message name="IDS_ASH_SIGN_OUT_WARNING_POPUP_TEXT_ACCESSIBLE" desc="The message used by accessibility to indicate the content of the popup when the user preses the exit shortcut in chrome-os.">
Press Control Shift Q twice to sign out.
</message>
<message name="IDS_ASH_EXIT_WARNING_POPUP_TEXT" desc="The text of the popup when the user preses the exit shortcut.">
Press Ctrl+Shift+Q twice to quit.
</message>
Expand Down

0 comments on commit e8b4812

Please sign in to comment.