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

Side by Side Diff: remoting/host/win/rdp_desktop_session.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « remoting/host/win/rdp_client_window.cc ('k') | remoting/host/win/security_descriptor.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_desktop_session.h" 5 #include "remoting/host/win/rdp_desktop_session.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "remoting/base/auto_thread_task_runner.h" 8 #include "remoting/base/auto_thread_task_runner.h"
9 #include "remoting/host/win/chromoting_module.h" 9 #include "remoting/host/win/chromoting_module.h"
10 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" 10 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
(...skipping 15 matching lines...) Expand all
26 DCHECK(task_runner->BelongsToCurrentThread()); 26 DCHECK(task_runner->BelongsToCurrentThread());
27 27
28 client_.reset(new RdpClient(task_runner, task_runner, 28 client_.reset(new RdpClient(task_runner, task_runner,
29 webrtc::DesktopSize(width, height), 29 webrtc::DesktopSize(width, height),
30 base::UTF16ToUTF8(terminal_id), this)); 30 base::UTF16ToUTF8(terminal_id), this));
31 return S_OK; 31 return S_OK;
32 } 32 }
33 33
34 STDMETHODIMP RdpDesktopSession::Disconnect() { 34 STDMETHODIMP RdpDesktopSession::Disconnect() {
35 client_.reset(); 35 client_.reset();
36 event_handler_ = NULL; 36 event_handler_ = nullptr;
37 return S_OK; 37 return S_OK;
38 } 38 }
39 39
40 STDMETHODIMP RdpDesktopSession::ChangeResolution(long width, long height) { 40 STDMETHODIMP RdpDesktopSession::ChangeResolution(long width, long height) {
41 return E_NOTIMPL; 41 return E_NOTIMPL;
42 } 42 }
43 43
44 STDMETHODIMP RdpDesktopSession::InjectSas() { 44 STDMETHODIMP RdpDesktopSession::InjectSas() {
45 if (client_) 45 if (client_)
46 client_->InjectSas(); 46 client_->InjectSas();
47 return S_OK; 47 return S_OK;
48 } 48 }
49 49
50 void RdpDesktopSession::OnRdpConnected() { 50 void RdpDesktopSession::OnRdpConnected() {
51 HRESULT result = event_handler_->OnRdpConnected(); 51 HRESULT result = event_handler_->OnRdpConnected();
52 CHECK(SUCCEEDED(result)) << "OnRdpConnected() failed: 0x" 52 CHECK(SUCCEEDED(result)) << "OnRdpConnected() failed: 0x"
53 << std::hex << result << std::dec << "."; 53 << std::hex << result << std::dec << ".";
54 } 54 }
55 55
56 void RdpDesktopSession::OnRdpClosed() { 56 void RdpDesktopSession::OnRdpClosed() {
57 HRESULT result = event_handler_->OnRdpClosed(); 57 HRESULT result = event_handler_->OnRdpClosed();
58 CHECK(SUCCEEDED(result)) << "OnRdpClosed() failed: 0x" << std::hex << result 58 CHECK(SUCCEEDED(result)) << "OnRdpClosed() failed: 0x" << std::hex << result
59 << std::dec << "."; 59 << std::dec << ".";
60 } 60 }
61 61
62 } // namespace remoting 62 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/win/rdp_client_window.cc ('k') | remoting/host/win/security_descriptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698