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

Side by Side Diff: extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc

Issue 2137013005: [Extensions] Code Cleanup - Remove redundant smart-ptr get()s (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.h" 5 #include "extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.h"
6 6
7 #include "content/public/common/socket_permission_request.h" 7 #include "content/public/common/socket_permission_request.h"
8 #include "extensions/browser/api/socket/tcp_socket.h" 8 #include "extensions/browser/api/socket/tcp_socket.h"
9 #include "extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_disp atcher.h" 9 #include "extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_disp atcher.h"
10 #include "extensions/common/api/sockets/sockets_manifest_data.h" 10 #include "extensions/common/api/sockets/sockets_manifest_data.h"
(...skipping 30 matching lines...) Expand all
41 new std::string(localAddress.ToStringWithoutPort())); 41 new std::string(localAddress.ToStringWithoutPort()));
42 socket_info.local_port.reset(new int(localAddress.port())); 42 socket_info.local_port.reset(new int(localAddress.port()));
43 } 43 }
44 44
45 return socket_info; 45 return socket_info;
46 } 46 }
47 47
48 void SetSocketProperties(ResumableTCPServerSocket* socket, 48 void SetSocketProperties(ResumableTCPServerSocket* socket,
49 SocketProperties* properties) { 49 SocketProperties* properties) {
50 if (properties->name.get()) { 50 if (properties->name.get()) {
51 socket->set_name(*properties->name.get()); 51 socket->set_name(*properties->name);
52 } 52 }
53 if (properties->persistent.get()) { 53 if (properties->persistent.get()) {
54 socket->set_persistent(*properties->persistent.get()); 54 socket->set_persistent(*properties->persistent);
55 } 55 }
56 } 56 }
57 57
58 } // namespace 58 } // namespace
59 59
60 namespace extensions { 60 namespace extensions {
61 namespace api { 61 namespace api {
62 62
63 TCPServerSocketAsyncApiFunction::~TCPServerSocketAsyncApiFunction() {} 63 TCPServerSocketAsyncApiFunction::~TCPServerSocketAsyncApiFunction() {}
64 64
(...skipping 15 matching lines...) Expand all
80 bool SocketsTcpServerCreateFunction::Prepare() { 80 bool SocketsTcpServerCreateFunction::Prepare() {
81 params_ = sockets_tcp_server::Create::Params::Create(*args_); 81 params_ = sockets_tcp_server::Create::Params::Create(*args_);
82 EXTENSION_FUNCTION_VALIDATE(params_.get()); 82 EXTENSION_FUNCTION_VALIDATE(params_.get());
83 return true; 83 return true;
84 } 84 }
85 85
86 void SocketsTcpServerCreateFunction::Work() { 86 void SocketsTcpServerCreateFunction::Work() {
87 ResumableTCPServerSocket* socket = 87 ResumableTCPServerSocket* socket =
88 new ResumableTCPServerSocket(extension_->id()); 88 new ResumableTCPServerSocket(extension_->id());
89 89
90 sockets_tcp_server::SocketProperties* properties = 90 sockets_tcp_server::SocketProperties* properties = params_->properties.get();
91 params_.get()->properties.get();
92 if (properties) { 91 if (properties) {
93 SetSocketProperties(socket, properties); 92 SetSocketProperties(socket, properties);
94 } 93 }
95 94
96 sockets_tcp_server::CreateInfo create_info; 95 sockets_tcp_server::CreateInfo create_info;
97 create_info.socket_id = AddSocket(socket); 96 create_info.socket_id = AddSocket(socket);
98 results_ = sockets_tcp_server::Create::Results::Create(create_info); 97 results_ = sockets_tcp_server::Create::Results::Create(create_info);
99 } 98 }
100 99
101 SocketsTcpServerUpdateFunction::SocketsTcpServerUpdateFunction() {} 100 SocketsTcpServerUpdateFunction::SocketsTcpServerUpdateFunction() {}
102 101
103 SocketsTcpServerUpdateFunction::~SocketsTcpServerUpdateFunction() {} 102 SocketsTcpServerUpdateFunction::~SocketsTcpServerUpdateFunction() {}
104 103
105 bool SocketsTcpServerUpdateFunction::Prepare() { 104 bool SocketsTcpServerUpdateFunction::Prepare() {
106 params_ = sockets_tcp_server::Update::Params::Create(*args_); 105 params_ = sockets_tcp_server::Update::Params::Create(*args_);
107 EXTENSION_FUNCTION_VALIDATE(params_.get()); 106 EXTENSION_FUNCTION_VALIDATE(params_.get());
108 return true; 107 return true;
109 } 108 }
110 109
111 void SocketsTcpServerUpdateFunction::Work() { 110 void SocketsTcpServerUpdateFunction::Work() {
112 ResumableTCPServerSocket* socket = GetTcpSocket(params_->socket_id); 111 ResumableTCPServerSocket* socket = GetTcpSocket(params_->socket_id);
113 if (!socket) { 112 if (!socket) {
114 error_ = kSocketNotFoundError; 113 error_ = kSocketNotFoundError;
115 return; 114 return;
116 } 115 }
117 116
118 SetSocketProperties(socket, &params_.get()->properties); 117 SetSocketProperties(socket, &params_->properties);
119 results_ = sockets_tcp_server::Update::Results::Create(); 118 results_ = sockets_tcp_server::Update::Results::Create();
120 } 119 }
121 120
122 SocketsTcpServerSetPausedFunction::SocketsTcpServerSetPausedFunction() 121 SocketsTcpServerSetPausedFunction::SocketsTcpServerSetPausedFunction()
123 : socket_event_dispatcher_(NULL) {} 122 : socket_event_dispatcher_(NULL) {}
124 123
125 SocketsTcpServerSetPausedFunction::~SocketsTcpServerSetPausedFunction() {} 124 SocketsTcpServerSetPausedFunction::~SocketsTcpServerSetPausedFunction() {}
126 125
127 bool SocketsTcpServerSetPausedFunction::Prepare() { 126 bool SocketsTcpServerSetPausedFunction::Prepare() {
128 params_ = api::sockets_tcp_server::SetPaused::Params::Create(*args_); 127 params_ = api::sockets_tcp_server::SetPaused::Params::Create(*args_);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 184
186 SocketPermissionRequest param( 185 SocketPermissionRequest param(
187 SocketPermissionRequest::TCP_LISTEN, params_->address, params_->port); 186 SocketPermissionRequest::TCP_LISTEN, params_->address, params_->port);
188 if (!SocketsManifestData::CheckRequest(extension(), param)) { 187 if (!SocketsManifestData::CheckRequest(extension(), param)) {
189 error_ = kPermissionError; 188 error_ = kPermissionError;
190 AsyncWorkCompleted(); 189 AsyncWorkCompleted();
191 return; 190 return;
192 } 191 }
193 192
194 int net_result = socket->Listen( 193 int net_result = socket->Listen(
195 params_->address, 194 params_->address, params_->port,
196 params_->port, 195 params_->backlog.get() ? *params_->backlog : kDefaultListenBacklog,
197 params_->backlog.get() ? *params_->backlog.get() : kDefaultListenBacklog,
198 &error_); 196 &error_);
199 results_ = sockets_tcp_server::Listen::Results::Create(net_result); 197 results_ = sockets_tcp_server::Listen::Results::Create(net_result);
200 if (net_result == net::OK) { 198 if (net_result == net::OK) {
201 socket_event_dispatcher_->OnServerSocketListen(extension_->id(), 199 socket_event_dispatcher_->OnServerSocketListen(extension_->id(),
202 params_->socket_id); 200 params_->socket_id);
203 } else { 201 } else {
204 error_ = net::ErrorToString(net_result); 202 error_ = net::ErrorToString(net_result);
205 AsyncWorkCompleted(); 203 AsyncWorkCompleted();
206 return; 204 return;
207 } 205 }
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 if (socket) { 286 if (socket) {
289 socket_infos.push_back(CreateSocketInfo(socket_id, socket)); 287 socket_infos.push_back(CreateSocketInfo(socket_id, socket));
290 } 288 }
291 } 289 }
292 } 290 }
293 results_ = sockets_tcp_server::GetSockets::Results::Create(socket_infos); 291 results_ = sockets_tcp_server::GetSockets::Results::Create(socket_infos);
294 } 292 }
295 293
296 } // namespace api 294 } // namespace api
297 } // namespace extensions 295 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/api/sockets_tcp/sockets_tcp_api.cc ('k') | extensions/browser/api/sockets_udp/sockets_udp_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698