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

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

Issue 1547473005: Switch to standard integer types in remoting/host/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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.h ('k') | remoting/host/win/rdp_client_unittest.cc » ('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_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 9
9 #include "base/bind.h" 10 #include "base/bind.h"
10 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
11 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h"
12 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
13 #include "base/win/registry.h" 15 #include "base/win/registry.h"
14 #include "net/base/ip_endpoint.h" 16 #include "net/base/ip_endpoint.h"
15 #include "remoting/base/typed_buffer.h" 17 #include "remoting/base/typed_buffer.h"
16 #include "remoting/host/win/rdp_client_window.h" 18 #include "remoting/host/win/rdp_client_window.h"
17 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" 19 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
18 20
19 namespace remoting { 21 namespace remoting {
20 22
21 namespace { 23 namespace {
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 if (!key.Valid() || 140 if (!key.Valid() ||
139 (key.ReadValueDW(kRdpPortValueName, &server_port) != ERROR_SUCCESS) || 141 (key.ReadValueDW(kRdpPortValueName, &server_port) != ERROR_SUCCESS) ||
140 server_port > 65535) { 142 server_port > 65535) {
141 server_port = kDefaultRdpPort; 143 server_port = kDefaultRdpPort;
142 } 144 }
143 145
144 net::IPAddressNumber server_address( 146 net::IPAddressNumber server_address(
145 kRdpLoopbackAddress, 147 kRdpLoopbackAddress,
146 kRdpLoopbackAddress + arraysize(kRdpLoopbackAddress)); 148 kRdpLoopbackAddress + arraysize(kRdpLoopbackAddress));
147 net::IPEndPoint server_endpoint(server_address, 149 net::IPEndPoint server_endpoint(server_address,
148 static_cast<uint16>(server_port)); 150 static_cast<uint16_t>(server_port));
149 151
150 // Create the ActiveX control window. 152 // Create the ActiveX control window.
151 rdp_client_window_.reset(new RdpClientWindow(server_endpoint, terminal_id, 153 rdp_client_window_.reset(new RdpClientWindow(server_endpoint, terminal_id,
152 this)); 154 this));
153 if (!rdp_client_window_->Connect(screen_size)) { 155 if (!rdp_client_window_->Connect(screen_size)) {
154 rdp_client_window_.reset(); 156 rdp_client_window_.reset();
155 157
156 // Notify the caller that connection attempt failed. 158 // Notify the caller that connection attempt failed.
157 NotifyClosed(); 159 NotifyClosed();
158 } 160 }
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 } 229 }
228 230
229 if (event_handler_) { 231 if (event_handler_) {
230 RdpClient::EventHandler* event_handler = event_handler_; 232 RdpClient::EventHandler* event_handler = event_handler_;
231 event_handler_ = nullptr; 233 event_handler_ = nullptr;
232 event_handler->OnRdpClosed(); 234 event_handler->OnRdpClosed();
233 } 235 }
234 } 236 }
235 237
236 } // namespace remoting 238 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/win/rdp_client.h ('k') | remoting/host/win/rdp_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698