Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Unified Diff: remoting/host/win/rdp_client_window.h

Issue 14261008: Cancel any modal UI shown by the RDP control. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feedback. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/host/win/rdp_client_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/win/rdp_client_window.h
diff --git a/remoting/host/win/rdp_client_window.h b/remoting/host/win/rdp_client_window.h
index 33de1d3bfd7b0e2f51df67e2c51a770428d902e5..c4b71d233648ac358a920655c60363671c3fb08c 100644
--- a/remoting/host/win/rdp_client_window.h
+++ b/remoting/host/win/rdp_client_window.h
@@ -11,6 +11,7 @@
#include <atlctl.h>
#include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
#include "base/win/scoped_comptr.h"
#include "net/base/ip_endpoint.h"
@@ -105,10 +106,13 @@ class RdpClientWindow
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 15, OnConfirmClose)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 18,
OnAuthenticationWarningDisplayed)
+ SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 19,
+ OnAuthenticationWarningDismissed)
END_SINK_MAP()
// mstsc::IMsTscAxEvents notifications.
STDMETHOD(OnAuthenticationWarningDisplayed)();
+ STDMETHOD(OnAuthenticationWarningDismissed)();
STDMETHOD(OnConnected)();
STDMETHOD(OnDisconnected)(long reason);
STDMETHOD(OnFatalError)(long error_code);
@@ -132,6 +136,10 @@ class RdpClientWindow
// Interfaces exposed by the RDP ActiveX control.
base::win::ScopedComPtr<mstsc::IMsRdpClient> client_;
base::win::ScopedComPtr<mstsc::IMsRdpClientAdvancedSettings> client_settings_;
+
+ // Used to cancel modal dialog boxes shown by the RDP control.
+ class WindowHook;
+ scoped_refptr<WindowHook> window_activate_hook_;
};
} // namespace remoting
« no previous file with comments | « no previous file | remoting/host/win/rdp_client_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698