| Index: remoting/host/disconnect_window_win.cc
|
| ===================================================================
|
| --- remoting/host/disconnect_window_win.cc (revision 89904)
|
| +++ remoting/host/disconnect_window_win.cc (working copy)
|
| @@ -14,27 +14,36 @@
|
| // a dependency on the plugin's resource header.
|
| #include "remoting/host/plugin/host_plugin_resource.h"
|
|
|
| +// TODO(garykac): Lots of duplicated code in this file and
|
| +// continue_window_win.cc. These global floating windows are temporary so
|
| +// they should be deleted soon. If we need to expand this then we should
|
| +// create a class with the shared code.
|
| +
|
| // HMODULE from DllMain/WinMain. This is needed to find our dialog resource.
|
| // This is defined in:
|
| // Plugin: host_plugin.cc
|
| // SimpleHost: simple_host_process.cc
|
| extern HMODULE g_hModule;
|
|
|
| -namespace {
|
| +namespace remoting {
|
|
|
| -class DisconnectWindowWin : public remoting::DisconnectWindow {
|
| +class DisconnectWindowWin : public DisconnectWindow {
|
| public:
|
| DisconnectWindowWin();
|
| + virtual ~DisconnectWindowWin();
|
| +
|
| virtual void Show(remoting::ChromotingHost* host,
|
| const std::string& username) OVERRIDE;
|
| virtual void Hide() OVERRIDE;
|
|
|
| +private:
|
| static BOOL CALLBACK DialogProc(HWND hwmd, UINT msg, WPARAM wParam,
|
| LPARAM lParam);
|
|
|
| BOOL OnDialogMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
|
|
|
| -private:
|
| + void EndDialog();
|
| +
|
| remoting::ChromotingHost* host_;
|
| std::string username_;
|
| HWND hwnd_;
|
| @@ -54,6 +63,10 @@
|
| key_(0L) {
|
| }
|
|
|
| +DisconnectWindowWin::~DisconnectWindowWin() {
|
| + EndDialog();
|
| +}
|
| +
|
| BOOL CALLBACK DisconnectWindowWin::DialogProc(HWND hwnd, UINT msg,
|
| WPARAM wParam, LPARAM lParam) {
|
| DisconnectWindowWin* win = NULL;
|
| @@ -76,7 +89,7 @@
|
| case WM_INITDIALOG:
|
| {
|
| // Update username in dialog.
|
| - HWND hwndUsername = GetDlgItem(hwnd, IDC_USERNAME);
|
| + HWND hwndUsername = GetDlgItem(hwnd, IDC_DISCONNECT_USERNAME);
|
| CHECK(hwndUsername);
|
| std::wstring w_username = UTF8ToWide(username_);
|
| SetWindowText(hwndUsername, w_username.c_str());
|
| @@ -91,7 +104,7 @@
|
| return TRUE;
|
| case WM_APP:
|
| if (key_ == static_cast<DWORD>(lParam)) {
|
| - EndDialog(hwnd, LOWORD(wParam));
|
| + ::EndDialog(hwnd, LOWORD(wParam));
|
| hwnd_ = NULL;
|
| }
|
| return TRUE;
|
| @@ -101,7 +114,7 @@
|
| {
|
| CHECK(host_);
|
| host_->Shutdown(NULL);
|
| - EndDialog(hwnd, LOWORD(wParam));
|
| + ::EndDialog(hwnd, LOWORD(wParam));
|
| hwnd_ = NULL;
|
| }
|
| return TRUE;
|
| @@ -110,7 +123,7 @@
|
| return FALSE;
|
| }
|
|
|
| -void DisconnectWindowWin::Show(remoting::ChromotingHost* host,
|
| +void DisconnectWindowWin::Show(ChromotingHost* host,
|
| const std::string& username) {
|
| host_ = host;
|
| username_ = username;
|
| @@ -133,13 +146,17 @@
|
| }
|
|
|
| void DisconnectWindowWin::Hide() {
|
| + EndDialog();
|
| +}
|
| +
|
| +void DisconnectWindowWin::EndDialog() {
|
| if (hwnd_) {
|
| SendMessage(hwnd_, WM_APP, 0, (LPARAM)key_);
|
| }
|
| }
|
|
|
| -} // namespace
|
| -
|
| -remoting::DisconnectWindow* remoting::DisconnectWindow::Create() {
|
| +DisconnectWindow* DisconnectWindow::Create() {
|
| return new DisconnectWindowWin;
|
| }
|
| +
|
| +} // namespace remoting
|
|
|