Added l10n support to host dialogs on Windows.

remoting/host/disconnect_window_win.cc

Index: remoting/host/disconnect_window_win.cc
diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc
index d5d9b028dd1baf8a75d8c7e2f15867df8ead9f43..1d4c76ac3048342cc34a349ded0f10398a9fe08c 100644
--- a/remoting/host/disconnect_window_win.cc
+++ b/remoting/host/disconnect_window_win.cc
@@ -8,11 +8,13 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "remoting/host/chromoting_host.h"
 // TODO(wez): The DisconnectWindow isn't plugin-specific, so shouldn't have
 // a dependency on the plugin's resource header.
 #include "remoting/host/plugin/host_plugin_resource.h"
+#include "remoting/host/ui_strings.h"
 
 // TODO(garykac): Lots of duplicated code in this file and
 // continue_window_win.cc. These global floating windows are temporary so
@@ -45,11 +47,10 @@ private:
   BOOL OnDialogMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
   void ShutdownHost();
-  void SetDisconnectButtonText(HWND hwnd);
   void EndDialog(int result);
+  void LocalizeStrings(const UiStrings& stringss, const std::string& username);

[Wez, 2011/09/09 01:15:12]

Similarly.  Also |sstringss| vs |strings|.

[Jamie, 2011/09/09 17:21:02]

Done.

 
   remoting::ChromotingHost* host_;
-  std::string username_;
   HWND hwnd_;
   bool has_hotkey_;
 
@@ -58,7 +59,6 @@ private:
 
 DisconnectWindowWin::DisconnectWindowWin()
     : host_(NULL),
-      username_(""),
       hwnd_(NULL),
       has_hotkey_(false) {
 }
@@ -86,31 +86,9 @@ BOOL CALLBACK DisconnectWindowWin::DialogProc(HWND hwnd, UINT msg,
 BOOL DisconnectWindowWin::OnDialogMessage(HWND hwnd, UINT msg,
                                           WPARAM wParam, LPARAM lParam) {
   switch (msg) {
-    case WM_INITDIALOG:
-      {
-        // Update UI string placeholders with actual strings.
-        std::wstring w_title = UTF8ToWide(kTitle);
-        SetWindowText(hwnd, w_title.c_str());
-
-        SetDisconnectButtonText(hwnd);
-
-        HWND hwndSharingWith = GetDlgItem(hwnd, IDC_DISCONNECT_SHARINGWITH);
-        CHECK(hwndSharingWith);
-        std::wstring w_sharing = UTF8ToWide(kSharingWith);
-        SetWindowText(hwndSharingWith, w_sharing.c_str());
-
-        // Update username in dialog.
-        HWND hwndUsername = GetDlgItem(hwnd, IDC_DISCONNECT_USERNAME);
-        CHECK(hwndUsername);
-        std::wstring w_username = UTF8ToWide(username_);
-        SetWindowText(hwndUsername, w_username.c_str());
-      }
-      return TRUE;
     case WM_HOTKEY:
-      {
-        ShutdownHost();
-        EndDialog(0);
-      }
+      ShutdownHost();
+      EndDialog(0);
       return TRUE;
     case WM_CLOSE:
       // Ignore close messages.
@@ -122,10 +100,8 @@ BOOL DisconnectWindowWin::OnDialogMessage(HWND hwnd, UINT msg,
     case WM_COMMAND:
       switch (LOWORD(wParam)) {
         case IDC_DISCONNECT:
-          {
-            ShutdownHost();
-            EndDialog(LOWORD(wParam));
-          }
+          ShutdownHost();
+          EndDialog(LOWORD(wParam));
           return TRUE;
       }
   }
@@ -135,7 +111,6 @@ BOOL DisconnectWindowWin::OnDialogMessage(HWND hwnd, UINT msg,
 void DisconnectWindowWin::Show(ChromotingHost* host,
                                const std::string& username) {
   host_ = host;
-  username_ = username;
 
   CHECK(!hwnd_);
   hwnd_ = CreateDialogParam(g_hModule, MAKEINTRESOURCE(IDD_DISCONNECT), NULL,
@@ -145,14 +120,14 @@ void DisconnectWindowWin::Show(ChromotingHost* host,
     return;
   }
 
-  ShowWindow(hwnd_, SW_SHOW);
-
   // Set up handler for Ctrl-Alt-Esc shortcut.
   if (!has_hotkey_ && RegisterHotKey(hwnd_, DISCONNECT_HOTKEY_ID,
                                      MOD_ALT | MOD_CONTROL, VK_ESCAPE)) {
     has_hotkey_ = true;
   }
-  SetDisconnectButtonText(hwnd_);
+
+  LocalizeStrings(host->ui_strings(), username);
+  ShowWindow(hwnd_, SW_SHOW);
 }
 
 void DisconnectWindowWin::ShutdownHost() {
@@ -160,13 +135,22 @@ void DisconnectWindowWin::ShutdownHost() {
   host_->Shutdown(NULL);
 }
 
-void DisconnectWindowWin::SetDisconnectButtonText(HWND hwnd) {
-  HWND hwndButton = GetDlgItem(hwnd, IDC_DISCONNECT);
+void DisconnectWindowWin::LocalizeStrings(const UiStrings& strings,
+                                          const std::string& username) {
+  HWND hwndButton = GetDlgItem(hwnd_, IDC_DISCONNECT);
   CHECK(hwndButton);
-  std::wstring w_button = UTF8ToWide(kDisconnectButton);
-  if (has_hotkey_)
-    w_button += UTF8ToWide(kDisconnectKeysWin);
-  SetWindowText(hwndButton, w_button.c_str());
+  SetWindowText(
+    hwndButton,
+    has_hotkey_ ? strings.disconnect_button_text_plus_shortcut.c_str()
+                : strings.disconnect_button_text.c_str());

[Wez, 2011/09/09 01:15:12]

nit: This would be easier to read as:

const char* button_text = ... ? ... : ...;
SetWindowText(hwndButton, button_text);

[Jamie, 2011/09/09 17:21:02]

Done.

+
+  SetWindowText(hwnd_, strings.product_name.c_str());

[Wez, 2011/09/09 01:15:12]

nit: Set this first, since it's the odd-one-out of the three SetWindowText
calls, so it's easier to read that way.

[Jamie, 2011/09/09 17:21:02]

Done.

+
+  HWND hwndSharingWith = GetDlgItem(hwnd_, IDC_DISCONNECT_SHARINGWITH);
+  CHECK(hwndSharingWith);
+  string16 text = ReplaceStringPlaceholders(
+      strings.disconnect_message, UTF8ToUTF16(username), NULL);
+  SetWindowText(hwndSharingWith, text.c_str());
 }
 
 void DisconnectWindowWin::Hide() {