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

Side by Side Diff: chrome/browser/extensions/api/socket/socket.cc

Issue 10273016: Refactor the socket API to remove onEvent callback in socket.create() function. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix review issues Created 8 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/extensions/api/socket/socket.h" 5 #include "chrome/browser/extensions/api/socket/socket.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chrome/browser/extensions/api/api_resource_event_notifier.h" 8 #include "chrome/browser/extensions/api/api_resource_event_notifier.h"
9 #include "net/base/address_list.h" 9 #include "net/base/address_list.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
11 #include "net/base/ip_endpoint.h" 11 #include "net/base/ip_endpoint.h"
12 #include "net/base/net_errors.h" 12 #include "net/base/net_errors.h"
13 #include "net/socket/socket.h" 13 #include "net/socket/socket.h"
14 14
15 namespace extensions { 15 namespace extensions {
16 16
17 Socket::Socket(APIResourceEventNotifier* event_notifier) 17 Socket::Socket(APIResourceEventNotifier* event_notifier)
18 : APIResource(APIResource::SocketResource, event_notifier), 18 : APIResource(APIResource::SocketResource, event_notifier),
19 is_connected_(false) { 19 is_connected_(false) {
20 } 20 }
21 21
22 Socket::~Socket() { 22 Socket::~Socket() {
23 // Derived destructors should make sure the socket has been closed. 23 // Derived destructors should make sure the socket has been closed.
24 DCHECK(!is_connected_); 24 DCHECK(!is_connected_);
25 } 25 }
26 26
27 void Socket::OnDataRead(scoped_refptr<net::IOBuffer> io_buffer,
28 net::IPEndPoint* address,
29 int result) {
30 // OnDataRead will take ownership of data_value.
31 ListValue* data_value = new ListValue();
32 if (result >= 0) {
33 size_t bytes_size = static_cast<size_t>(result);
34 const char* io_buffer_start = io_buffer->data();
35 for (size_t i = 0; i < bytes_size; ++i) {
36 data_value->Set(i, Value::CreateIntegerValue(io_buffer_start[i]));
37 }
38 }
39
40 std::string ip_address_str;
41 int port = 0;
42 if (address)
43 IPEndPointToStringAndPort(*address, &ip_address_str, &port);
44 event_notifier()->OnDataRead(result, data_value, ip_address_str, port);
45 }
46
47 void Socket::OnWriteComplete(int result) {
48 event_notifier()->OnWriteComplete(result);
49 }
50
51 // static 27 // static
52 bool Socket::StringAndPortToIPEndPoint(const std::string& ip_address_str, 28 bool Socket::StringAndPortToIPEndPoint(const std::string& ip_address_str,
53 int port, 29 int port,
54 net::IPEndPoint* ip_end_point) { 30 net::IPEndPoint* ip_end_point) {
55 DCHECK(ip_end_point); 31 DCHECK(ip_end_point);
56 net::IPAddressNumber ip_number; 32 net::IPAddressNumber ip_number;
57 if (!net::ParseIPLiteralToNumber(ip_address_str, &ip_number)) 33 if (!net::ParseIPLiteralToNumber(ip_address_str, &ip_number))
58 return false; 34 return false;
59 35
60 *ip_end_point = net::IPEndPoint(ip_number, port); 36 *ip_end_point = net::IPEndPoint(ip_number, port);
(...skipping 24 matching lines...) Expand all
85 *ip_address_str = net::NetAddressToString( 61 *ip_address_str = net::NetAddressToString(
86 reinterpret_cast<struct sockaddr*>(&addr), addr_len); 62 reinterpret_cast<struct sockaddr*>(&addr), addr_len);
87 *port = address.port(); 63 *port = address.port();
88 } else { 64 } else {
89 *ip_address_str = ""; 65 *ip_address_str = "";
90 *port = 0; 66 *port = 0;
91 } 67 }
92 } 68 }
93 69
94 } // namespace extensions 70 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698