| 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 #include "remoting/host/win/rdp_client.h" | 5 #include "remoting/host/win/rdp_client.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_; | 74 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_; |
| 75 | 75 |
| 76 // Task runner on which |rdp_client_window_| is running. | 76 // Task runner on which |rdp_client_window_| is running. |
| 77 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; | 77 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; |
| 78 | 78 |
| 79 // Event handler receiving notification about connection state. The pointer is | 79 // Event handler receiving notification about connection state. The pointer is |
| 80 // cleared when Disconnect() methods is called, stopping any further updates. | 80 // cleared when Disconnect() methods is called, stopping any further updates. |
| 81 RdpClient::EventHandler* event_handler_; | 81 RdpClient::EventHandler* event_handler_; |
| 82 | 82 |
| 83 // Hosts the RDP ActiveX control. | 83 // Hosts the RDP ActiveX control. |
| 84 scoped_ptr<RdpClientWindow> rdp_client_window_; | 84 std::unique_ptr<RdpClientWindow> rdp_client_window_; |
| 85 | 85 |
| 86 // A self-reference to keep the object alive during connection shutdown. | 86 // A self-reference to keep the object alive during connection shutdown. |
| 87 scoped_refptr<Core> self_; | 87 scoped_refptr<Core> self_; |
| 88 | 88 |
| 89 DISALLOW_COPY_AND_ASSIGN(Core); | 89 DISALLOW_COPY_AND_ASSIGN(Core); |
| 90 }; | 90 }; |
| 91 | 91 |
| 92 RdpClient::RdpClient( | 92 RdpClient::RdpClient( |
| 93 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 93 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 94 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 94 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 } | 229 } |
| 230 | 230 |
| 231 if (event_handler_) { | 231 if (event_handler_) { |
| 232 RdpClient::EventHandler* event_handler = event_handler_; | 232 RdpClient::EventHandler* event_handler = event_handler_; |
| 233 event_handler_ = nullptr; | 233 event_handler_ = nullptr; |
| 234 event_handler->OnRdpClosed(); | 234 event_handler->OnRdpClosed(); |
| 235 } | 235 } |
| 236 } | 236 } |
| 237 | 237 |
| 238 } // namespace remoting | 238 } // namespace remoting |
| OLD | NEW |