Close the RDP connection if the authentication warning dialog is about to be shown.

BUG=137696


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

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

2 files changed, 15 insertions, 3 deletions

diff --git a/remoting/host/win/rdp_client_window.cc b/remoting/host/win/rdp_client_window.cc
index 8269079..fa02a80 100644
--- a/remoting/host/win/rdp_client_window.cc
+++ b/remoting/host/win/rdp_client_window.cc
@@ -50,9 +50,8 @@ bool RdpClientWindow::Connect(const SkISize& screen_size) {
 }
 
 void RdpClientWindow::Disconnect() {
-  DCHECK(m_hWnd);
-
-  SendMessage(WM_CLOSE);
+  if (m_hWnd)
+    SendMessage(WM_CLOSE);
 }
 
 void RdpClientWindow::OnClose() {
@@ -200,6 +199,16 @@ void RdpClientWindow::OnDestroy() {
   client_settings_.Release();
 }
 
+HRESULT RdpClientWindow::OnAuthenticationWarningDisplayed() {
+  LOG(ERROR) << "RDP: authentication warning is about to be shown. Closing "
+                "the connection because the modal UI will block any further "
+                "progress";
+
+  DestroyWindow();
+  NotifyDisconnected();
+  return S_OK;
+}
+
 HRESULT RdpClientWindow::OnConnected() {
   VLOG(1) << "RDP: successfully connected to " << server_endpoint_.ToString();
 
diff --git a/remoting/host/win/rdp_client_window.h b/remoting/host/win/rdp_client_window.h
index ee8d9fc..33de1d3 100644
--- a/remoting/host/win/rdp_client_window.h
+++ b/remoting/host/win/rdp_client_window.h
@@ -103,9 +103,12 @@ class RdpClientWindow
     SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 4, OnDisconnected)
     SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 10, OnFatalError)
     SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 15, OnConfirmClose)
+    SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 18,
+                  OnAuthenticationWarningDisplayed)
   END_SINK_MAP()
 
   // mstsc::IMsTscAxEvents notifications.
+  STDMETHOD(OnAuthenticationWarningDisplayed)();
   STDMETHOD(OnConnected)();
   STDMETHOD(OnDisconnected)(long reason);
   STDMETHOD(OnFatalError)(long error_code);