OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef REMOTING_HOST_WIN_RDP_DESKTOP_SESSION_H_ | 5 #ifndef REMOTING_HOST_WIN_RDP_DESKTOP_SESSION_H_ |
6 #define REMOTING_HOST_WIN_RDP_DESKTOP_SESSION_H_ | 6 #define REMOTING_HOST_WIN_RDP_DESKTOP_SESSION_H_ |
7 | 7 |
8 #include <atlbase.h> | 8 #include <atlbase.h> |
9 #include <atlcom.h> | 9 #include <atlcom.h> |
10 #include <atlctl.h> | 10 #include <atlctl.h> |
11 | 11 |
12 #include "base/memory/scoped_ptr.h" | 12 #include <memory> |
| 13 |
13 #include "base/win/scoped_comptr.h" | 14 #include "base/win/scoped_comptr.h" |
14 // chromoting_lib.h contains MIDL-generated declarations. | 15 // chromoting_lib.h contains MIDL-generated declarations. |
15 #include "remoting/host/chromoting_lib.h" | 16 #include "remoting/host/chromoting_lib.h" |
16 #include "remoting/host/win/rdp_client.h" | 17 #include "remoting/host/win/rdp_client.h" |
17 | 18 |
18 namespace remoting { | 19 namespace remoting { |
19 | 20 |
20 // Implements IRdpDesktopSession interface providing a way to host RdpClient | 21 // Implements IRdpDesktopSession interface providing a way to host RdpClient |
21 // objects in a COM component. | 22 // objects in a COM component. |
22 class __declspec(uuid(RDP_DESKTOP_SESSION_CLSID)) RdpDesktopSession | 23 class __declspec(uuid(RDP_DESKTOP_SESSION_CLSID)) RdpDesktopSession |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 // RdpClient::EventHandler interface. | 55 // RdpClient::EventHandler interface. |
55 void OnRdpConnected() override; | 56 void OnRdpConnected() override; |
56 void OnRdpClosed() override; | 57 void OnRdpClosed() override; |
57 | 58 |
58 BEGIN_COM_MAP(RdpDesktopSession) | 59 BEGIN_COM_MAP(RdpDesktopSession) |
59 COM_INTERFACE_ENTRY(IRdpDesktopSession) | 60 COM_INTERFACE_ENTRY(IRdpDesktopSession) |
60 COM_INTERFACE_ENTRY(IUnknown) | 61 COM_INTERFACE_ENTRY(IUnknown) |
61 END_COM_MAP() | 62 END_COM_MAP() |
62 | 63 |
63 // Implements loading and instantiation of the RDP ActiveX client. | 64 // Implements loading and instantiation of the RDP ActiveX client. |
64 scoped_ptr<RdpClient> client_; | 65 std::unique_ptr<RdpClient> client_; |
65 | 66 |
66 // Holds a reference to the caller's EventHandler, through which notifications | 67 // Holds a reference to the caller's EventHandler, through which notifications |
67 // are dispatched. Released in Disconnect(), to prevent further notifications. | 68 // are dispatched. Released in Disconnect(), to prevent further notifications. |
68 base::win::ScopedComPtr<IRdpDesktopSessionEventHandler> event_handler_; | 69 base::win::ScopedComPtr<IRdpDesktopSessionEventHandler> event_handler_; |
69 | 70 |
70 DECLARE_PROTECT_FINAL_CONSTRUCT() | 71 DECLARE_PROTECT_FINAL_CONSTRUCT() |
71 }; | 72 }; |
72 | 73 |
73 } // namespace remoting | 74 } // namespace remoting |
74 | 75 |
75 #endif // REMOTING_HOST_WIN_RDP_DESKTOP_SESSION_H_ | 76 #endif // REMOTING_HOST_WIN_RDP_DESKTOP_SESSION_H_ |
OLD | NEW |