diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:38:13 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:38:13 +0000 |
| commit | 448cce5ac719f13dbe5c5e986bca3dbb19925ebc (patch) | |
| tree | 124613f2849c352c7a64374702674296eff08bcc /remoting/host/ui_strings.cc | |
| parent | 2bb83e405afd54dd75f88e024e6de1f6809a69d2 (diff) | |
| download | chromium_src-448cce5ac719f13dbe5c5e986bca3dbb19925ebc.zip chromium_src-448cce5ac719f13dbe5c5e986bca3dbb19925ebc.tar.gz chromium_src-448cce5ac719f13dbe5c5e986bca3dbb19925ebc.tar.bz2 | |
Disable Ctrl+Alt+Esc on Mac and Linux.
BUG=129652,129684
Review URL: https://chromiumcodereview.appspot.com/10453015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/ui_strings.cc')
| -rw-r--r-- | remoting/host/ui_strings.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/remoting/host/ui_strings.cc b/remoting/host/ui_strings.cc index 99c59b3..06d912b 100644 --- a/remoting/host/ui_strings.cc +++ b/remoting/host/ui_strings.cc @@ -18,7 +18,14 @@ UiStrings::UiStrings() : // doesn't have a bundle (and hence no dialog) on that platform and // the web-app will provide the correct localization for this string. disconnect_button_text_plus_shortcut( - ASCIIToUTF16("Disconnect (Ctrl+Alt+Esc)")), +#if defined(OS_MACOSX) + // TODO(sergeyu): Currently the shortcut is disabled because it + // doesn't work properly on Mac. + ASCIIToUTF16("Disconnect") +#else // !defined(OS_MACOSX) + ASCIIToUTF16("Disconnect (Ctrl+Alt+Esc)") +#endif // !defined(OS_MACOSX) + ), continue_prompt(ASCIIToUTF16( "You are currently sharing this machine with another user. " "Please confirm that you want to continue sharing.")), |