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

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

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)
Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 years, 2 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 <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/containers/hash_tables.h" 12 #include "base/containers/hash_tables.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/values.h"
14 #include "build/build_config.h" 15 #include "build/build_config.h"
15 #include "content/public/browser/browser_context.h" 16 #include "content/public/browser/browser_context.h"
16 #include "content/public/browser/resource_context.h" 17 #include "content/public/browser/resource_context.h"
17 #include "content/public/browser/storage_partition.h" 18 #include "content/public/browser/storage_partition.h"
18 #include "extensions/browser/api/dns/host_resolver_wrapper.h" 19 #include "extensions/browser/api/dns/host_resolver_wrapper.h"
19 #include "extensions/browser/api/socket/socket.h" 20 #include "extensions/browser/api/socket/socket.h"
20 #include "extensions/browser/api/socket/tcp_socket.h" 21 #include "extensions/browser/api/socket/tcp_socket.h"
21 #include "extensions/browser/api/socket/tls_socket.h" 22 #include "extensions/browser/api/socket/tls_socket.h"
22 #include "extensions/browser/api/socket/udp_socket.h" 23 #include "extensions/browser/api/socket/udp_socket.h"
23 #include "extensions/browser/extension_system.h" 24 #include "extensions/browser/extension_system.h"
24 #include "extensions/common/extension.h" 25 #include "extensions/common/extension.h"
25 #include "extensions/common/permissions/permissions_data.h" 26 #include "extensions/common/permissions/permissions_data.h"
26 #include "extensions/common/permissions/socket_permission.h" 27 #include "extensions/common/permissions/socket_permission.h"
27 #include "net/base/host_port_pair.h" 28 #include "net/base/host_port_pair.h"
28 #include "net/base/io_buffer.h" 29 #include "net/base/io_buffer.h"
29 #include "net/base/ip_endpoint.h" 30 #include "net/base/ip_endpoint.h"
30 #include "net/base/net_errors.h" 31 #include "net/base/net_errors.h"
31 #include "net/base/network_interfaces.h" 32 #include "net/base/network_interfaces.h"
32 #include "net/base/url_util.h" 33 #include "net/base/url_util.h"
33 #include "net/log/net_log.h" 34 #include "net/log/net_log_with_source.h"
34 #include "net/url_request/url_request_context.h" 35 #include "net/url_request/url_request_context.h"
35 #include "net/url_request/url_request_context_getter.h" 36 #include "net/url_request/url_request_context_getter.h"
36 37
37 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
38 #include "content/public/browser/browser_thread.h" 39 #include "content/public/browser/browser_thread.h"
39 #endif // OS_CHROMEOS 40 #endif // OS_CHROMEOS
40 41
41 namespace extensions { 42 namespace extensions {
42 43
43 namespace { 44 namespace {
(...skipping 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 } else { 1090 } else {
1090 RemoveSocket(params_->socket_id); 1091 RemoveSocket(params_->socket_id);
1091 error_ = net::ErrorToString(result); 1092 error_ = net::ErrorToString(result);
1092 } 1093 }
1093 1094
1094 results_ = api::socket::Secure::Results::Create(result); 1095 results_ = api::socket::Secure::Results::Create(result);
1095 AsyncWorkCompleted(); 1096 AsyncWorkCompleted();
1096 } 1097 }
1097 1098
1098 } // namespace extensions 1099 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698