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

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

Issue 1290723003: Stop including network_interfaces.h from net_util.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: TOT and remove AUTHORS change as it is there already Created 5 years, 4 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/socket/socket_api.h" 5 #include "extensions/browser/api/socket/socket_api.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
11 #include "content/public/browser/browser_context.h" 11 #include "content/public/browser/browser_context.h"
12 #include "content/public/browser/resource_context.h" 12 #include "content/public/browser/resource_context.h"
13 #include "extensions/browser/api/dns/host_resolver_wrapper.h" 13 #include "extensions/browser/api/dns/host_resolver_wrapper.h"
14 #include "extensions/browser/api/socket/socket.h" 14 #include "extensions/browser/api/socket/socket.h"
15 #include "extensions/browser/api/socket/tcp_socket.h" 15 #include "extensions/browser/api/socket/tcp_socket.h"
16 #include "extensions/browser/api/socket/tls_socket.h" 16 #include "extensions/browser/api/socket/tls_socket.h"
17 #include "extensions/browser/api/socket/udp_socket.h" 17 #include "extensions/browser/api/socket/udp_socket.h"
18 #include "extensions/browser/extension_system.h" 18 #include "extensions/browser/extension_system.h"
19 #include "extensions/common/extension.h" 19 #include "extensions/common/extension.h"
20 #include "extensions/common/permissions/permissions_data.h" 20 #include "extensions/common/permissions/permissions_data.h"
21 #include "extensions/common/permissions/socket_permission.h" 21 #include "extensions/common/permissions/socket_permission.h"
22 #include "net/base/host_port_pair.h" 22 #include "net/base/host_port_pair.h"
23 #include "net/base/io_buffer.h" 23 #include "net/base/io_buffer.h"
24 #include "net/base/ip_endpoint.h" 24 #include "net/base/ip_endpoint.h"
25 #include "net/base/net_errors.h" 25 #include "net/base/net_errors.h"
26 #include "net/base/net_util.h" 26 #include "net/base/network_interfaces.h"
27 #include "net/log/net_log.h" 27 #include "net/log/net_log.h"
28 #include "net/url_request/url_request_context.h" 28 #include "net/url_request/url_request_context.h"
29 #include "net/url_request/url_request_context_getter.h" 29 #include "net/url_request/url_request_context_getter.h"
30 30
31 #if defined(OS_CHROMEOS) 31 #if defined(OS_CHROMEOS)
32 #include "content/public/browser/browser_thread.h" 32 #include "content/public/browser/browser_thread.h"
33 #endif // OS_CHROMEOS 33 #endif // OS_CHROMEOS
34 34
35 namespace extensions { 35 namespace extensions {
36 36
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 } else { 1065 } else {
1066 RemoveSocket(params_->socket_id); 1066 RemoveSocket(params_->socket_id);
1067 error_ = net::ErrorToString(result); 1067 error_ = net::ErrorToString(result);
1068 } 1068 }
1069 1069
1070 results_ = api::socket::Secure::Results::Create(result); 1070 results_ = api::socket::Secure::Results::Create(result);
1071 AsyncWorkCompleted(); 1071 AsyncWorkCompleted();
1072 } 1072 }
1073 1073
1074 } // namespace extensions 1074 } // namespace extensions
OLDNEW
« no previous file with comments | « content/renderer/p2p/ipc_network_manager_unittest.cc ('k') | extensions/browser/api/system_network/system_network_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698