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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/ui_strings.h" 5 #include "remoting/host/ui_strings.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 8
9 namespace remoting { 9 namespace remoting {
10 10
11 UiStrings::UiStrings() : 11 UiStrings::UiStrings() :
12 direction(LTR), 12 direction(LTR),
13 product_name(ASCIIToUTF16("Chromoting")), 13 product_name(ASCIIToUTF16("Chromoting")),
14 disconnect_message( 14 disconnect_message(
15 ASCIIToUTF16("Your desktop is currently being shared with $1.")), 15 ASCIIToUTF16("Your desktop is currently being shared with $1.")),
16 disconnect_button_text(ASCIIToUTF16("Disconnect")), 16 disconnect_button_text(ASCIIToUTF16("Disconnect")),
17 // This is the wrong shortcut on Mac OS X, but remoting_simple_host 17 // This is the wrong shortcut on Mac OS X, but remoting_simple_host
18 // doesn't have a bundle (and hence no dialog) on that platform and 18 // doesn't have a bundle (and hence no dialog) on that platform and
19 // the web-app will provide the correct localization for this string. 19 // the web-app will provide the correct localization for this string.
20 disconnect_button_text_plus_shortcut( 20 disconnect_button_text_plus_shortcut(
21 #if defined(OS_MACOSX) 21 ASCIIToUTF16("Disconnect (Ctrl+Alt+Esc)")),
22 // TODO(sergeyu): Currently the shortcut is disabled because it
23 // doesn't work properly on Mac.
24 ASCIIToUTF16("Disconnect")
25 #else // !defined(OS_MACOSX)
26 ASCIIToUTF16("Disconnect (Ctrl+Alt+Esc)")
27 #endif // !defined(OS_MACOSX)
28 ),
29 continue_prompt(ASCIIToUTF16( 22 continue_prompt(ASCIIToUTF16(
30 "You are currently sharing this machine with another user. " 23 "You are currently sharing this machine with another user. "
31 "Please confirm that you want to continue sharing.")), 24 "Please confirm that you want to continue sharing.")),
32 continue_button_text(ASCIIToUTF16("Continue")), 25 continue_button_text(ASCIIToUTF16("Continue")),
33 stop_sharing_button_text(ASCIIToUTF16("Stop Sharing")) { 26 stop_sharing_button_text(ASCIIToUTF16("Stop Sharing")) {
34 } 27 }
35 28
36 UiStrings::~UiStrings() { } 29 UiStrings::~UiStrings() { }
37 30
38 } 31 }
OLDNEW
« 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