Removed shortcut text from disconnect buttons.

BUG=152575


Review URL: https://chromiumcodereview.appspot.com/11316027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168162 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 3 insertions, 32 deletions

diff --git a/remoting/host/disconnect_window_gtk.cc b/remoting/host/disconnect_window_gtk.cc
index 13c2c6e..3dfe427 100644
--- a/remoting/host/disconnect_window_gtk.cc
+++ b/remoting/host/disconnect_window_gtk.cc
@@ -111,7 +111,7 @@ void DisconnectWindowGtk::CreateWindow(const UiStrings& ui_strings) {
   gtk_container_add(GTK_CONTAINER(align), button_row);
 
   button_ = gtk_button_new_with_label(
-      UTF16ToUTF8(ui_strings.disconnect_button_text_plus_shortcut).c_str());
+      UTF16ToUTF8(ui_strings.disconnect_button_text).c_str());
   gtk_box_pack_end(GTK_BOX(button_row), button_, FALSE, FALSE, 0);
 
   g_signal_connect(button_, "clicked", G_CALLBACK(OnClickedThunk), this);
diff --git a/remoting/host/disconnect_window_mac.mm b/remoting/host/disconnect_window_mac.mm
index 58fa041..e5cfcc4 100644
--- a/remoting/host/disconnect_window_mac.mm
+++ b/remoting/host/disconnect_window_mac.mm
@@ -112,7 +112,7 @@ scoped_ptr<DisconnectWindow> DisconnectWindow::Create() {
   [connectedToField_ setStringValue:base::SysUTF16ToNSString(text)];
 
   [disconnectButton_ setTitle:base::SysUTF16ToNSString(
-      host_->ui_strings().disconnect_button_text_plus_shortcut)];
+      host_->ui_strings().disconnect_button_text)];
 
   // Resize the window dynamically based on the content.
   CGFloat oldConnectedWidth = NSWidth([connectedToField_ bounds]);
diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc
index c033619..7474db6 100644
--- a/remoting/host/disconnect_window_win.cc
+++ b/remoting/host/disconnect_window_win.cc
@@ -226,11 +226,8 @@ void DisconnectWindowWin::SetStrings(const UiStrings& strings,
 
   HWND hwndButton = GetDlgItem(hwnd_, IDC_DISCONNECT);
   CHECK(hwndButton);
-  const WCHAR* label =
-    has_hotkey_ ? strings.disconnect_button_text_plus_shortcut.c_str()
-                : strings.disconnect_button_text.c_str();
   int button_old_required_width = GetControlTextWidth(hwndButton);
-  SetWindowText(hwndButton, label);
+  SetWindowText(hwndButton, strings.disconnect_button_text.c_str());
   int button_new_required_width = GetControlTextWidth(hwndButton);
 
   HWND hwndSharingWith = GetDlgItem(hwnd_, IDC_DISCONNECT_SHARINGWITH);
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index a83bd3b..b1c71cf 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -1325,15 +1325,6 @@ void HostNPScriptObject::LocalizeStrings(NPObject* localize_func) {
                  &ui_strings_.product_name);
   LocalizeString(localize_func, /*i18n-content*/"DISCONNECT_OTHER_BUTTON",
                  &ui_strings_.disconnect_button_text);
-  LocalizeString(localize_func,
-#if defined(OS_WIN)
-      /*i18n-content*/"DISCONNECT_BUTTON_PLUS_SHORTCUT_WINDOWS",
-#elif defined(OS_MACOSX)
-      /*i18n-content*/"DISCONNECT_BUTTON_PLUS_SHORTCUT_MAC_OS_X",
-#else
-      /*i18n-content*/"DISCONNECT_BUTTON_PLUS_SHORTCUT_LINUX",
-#endif
-      &ui_strings_.disconnect_button_text_plus_shortcut);
   LocalizeString(localize_func, /*i18n-content*/"CONTINUE_PROMPT",
                  &ui_strings_.continue_prompt);
   LocalizeString(localize_func, /*i18n-content*/"CONTINUE_BUTTON",
diff --git a/remoting/host/ui_strings.cc b/remoting/host/ui_strings.cc
index d691753..1c0c4c3 100644
--- a/remoting/host/ui_strings.cc
+++ b/remoting/host/ui_strings.cc
@@ -22,11 +22,6 @@ UiStrings::UiStrings() :
         "Your desktop and any audio output are currently shared with $1.")),
 #endif
     disconnect_button_text(ASCIIToUTF16("Disconnect")),
-    // This is the wrong shortcut on Mac OS X, but remoting_simple_host
-    // 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)")),
     continue_prompt(ASCIIToUTF16(
         "You are currently sharing this machine with another user. "
         "Please confirm that you want to continue sharing.")),
diff --git a/remoting/host/ui_strings.h b/remoting/host/ui_strings.h
index bdd0c4a..8f52008 100644
--- a/remoting/host/ui_strings.h
+++ b/remoting/host/ui_strings.h
@@ -35,9 +35,6 @@ struct UiStrings {
   // The label on the disconnect dialog button, without the keyboard shortcut.
   string16 disconnect_button_text;
 
-  // The label on the disconnect dialog button, with the keyboard shortcut.
-  string16 disconnect_button_text_plus_shortcut;
-
   // The confirmation prompt displayed by the continue window.
   string16 continue_prompt;
 
diff --git a/remoting/resources/string_resources.grd b/remoting/resources/string_resources.grd
index 52456fc..a60673b 100644
--- a/remoting/resources/string_resources.grd
+++ b/remoting/resources/string_resources.grd
@@ -297,15 +297,6 @@
       <message desc="Label for the 'yes' response to the dialog asking the user to confirm whether or not they want to disable remote access to a host." name="IDR_DISABLE_HOST">
         Disable
       </message>
-      <message desc="Label for the disconnect button including the Linux keyboard shortcut. Clicking this button disconnects the remote user." name="IDR_DISCONNECT_BUTTON_PLUS_SHORTCUT_LINUX">
-        Disconnect (Ctrl+Alt+Esc)
-      </message>
-      <message desc="Label for the disconnect button including the Mac OS X keyboard shortcut. Clicking this button disconnects the remote user." name="IDR_DISCONNECT_BUTTON_PLUS_SHORTCUT_MAC_OS_X">
-        Disconnect (Opt+Ctrl+Esc)
-      </message>
-      <message desc="Label for the disconnect button including the Windows keyboard shortcut. Clicking this button disconnects the remote user." name="IDR_DISCONNECT_BUTTON_PLUS_SHORTCUT_WINDOWS">
-        Disconnect (Ctrl+Alt+Esc)
-      </message>
       <message desc="Label for the client-side disconnect button. Clicking this button disconnects oneself from the host." name="IDR_DISCONNECT_MYSELF_BUTTON">
         Disconnect
       </message>