Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(421)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/host/ui_strings.cc

Issue 10447041: Fix Ctrl+Alt+Esc keyboard shortcut in Me2Me host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/ui_strings.cc
diff --git a/remoting/host/ui_strings.cc b/remoting/host/ui_strings.cc
index 06d912b9879e31127740dc89495afd6587b50ce2..99c59b32f87349e05feb84069ea3e5974acb9efd 100644
--- a/remoting/host/ui_strings.cc
+++ b/remoting/host/ui_strings.cc
@@ -18,14 +18,7 @@ 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(
-#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)
- ),
+ ASCIIToUTF16("Disconnect (Ctrl+Alt+Esc)")),
continue_prompt(ASCIIToUTF16(
"You are currently sharing this machine with another user. "
"Please confirm that you want to continue sharing.")),
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698