Chromoting: the Me2me host now presents a notification on the console allowing a user to disconnect…

remoting/host/continue_window_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/continue_window.h"
 
 #include <windows.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.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/host_ui_resource.h"
 
 // TODO(garykac): Lots of duplicated code in this file and
 // disconnect_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
@@ skipping 94 matching lines @@
   SetStrings(host->ui_strings());
   ShowWindow(hwnd_, SW_SHOW);
 }
 
 void ContinueWindowWin::Hide() {
   EndDialog();
 }
 
 void ContinueWindowWin::EndDialog() {
   if (hwnd_) {
-    ::EndDialog(hwnd_, 0);
+    ::DestroyWindow(hwnd_);

[Jamie, 2012/05/11 19:51:39]

What's the effect of this change?

[alexeypa (please no reviews), 2012/05/11 20:01:21]

EndDialog() does not have effect on non-modal dialogs. They should be closed
just like any other windows. We were leaking window handles, basically.

     hwnd_ = NULL;
   }
 }
 
 void ContinueWindowWin::SetStrings(const UiStrings& strings) {
   SetWindowText(hwnd_, strings.product_name.c_str());
 
   HWND hwndMessage = GetDlgItem(hwnd_, IDC_CONTINUE_MESSAGE);
   CHECK(hwndMessage);
   SetWindowText(hwndMessage, strings.continue_prompt.c_str());
 
   HWND hwndDefault = GetDlgItem(hwnd_, IDC_CONTINUE_DEFAULT);
   CHECK(hwndDefault);
   SetWindowText(hwndDefault, strings.continue_button_text.c_str());
 
   HWND hwndCancel = GetDlgItem(hwnd_, IDC_CONTINUE_CANCEL);
   CHECK(hwndCancel);
   SetWindowText(hwndCancel, strings.stop_sharing_button_text.c_str());
 }
 
 scoped_ptr<ContinueWindow> ContinueWindow::Create() {
   return scoped_ptr<ContinueWindow>(new ContinueWindowWin());
 }
 
 }  // namespace remoting