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

Side by Side Diff: google_apis/gcm/engine/connection_factory_impl.h

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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) 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 #ifndef GOOGLE_APIS_GCM_ENGINE_CONNECTION_FACTORY_IMPL_H_ 5 #ifndef GOOGLE_APIS_GCM_ENGINE_CONNECTION_FACTORY_IMPL_H_
6 #define GOOGLE_APIS_GCM_ENGINE_CONNECTION_FACTORY_IMPL_H_ 6 #define GOOGLE_APIS_GCM_ENGINE_CONNECTION_FACTORY_IMPL_H_
7 7
8 #include "google_apis/gcm/engine/connection_factory.h" 8 #include "google_apis/gcm/engine/connection_factory.h"
9 9
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // The backoff policy to use. 139 // The backoff policy to use.
140 const net::BackoffEntry::Policy backoff_policy_; 140 const net::BackoffEntry::Policy backoff_policy_;
141 141
142 // ---- net:: components for establishing connections. ---- 142 // ---- net:: components for establishing connections. ----
143 // Network session for creating new GCM connections. 143 // Network session for creating new GCM connections.
144 net::HttpNetworkSession* gcm_network_session_; 144 net::HttpNetworkSession* gcm_network_session_;
145 // HTTP Network session. If set, is used for extracting proxy auth 145 // HTTP Network session. If set, is used for extracting proxy auth
146 // credentials. If nullptr, is ignored. 146 // credentials. If nullptr, is ignored.
147 net::HttpNetworkSession* http_network_session_; 147 net::HttpNetworkSession* http_network_session_;
148 // Net log to use in connection attempts. 148 // Net log to use in connection attempts.
149 net::BoundNetLog bound_net_log_; 149 net::NetLogWithSource net_log_;
150 // The current PAC request, if one exists. Owned by the proxy service. 150 // The current PAC request, if one exists. Owned by the proxy service.
151 net::ProxyService::PacRequest* pac_request_; 151 net::ProxyService::PacRequest* pac_request_;
152 // The current proxy info. 152 // The current proxy info.
153 net::ProxyInfo proxy_info_; 153 net::ProxyInfo proxy_info_;
154 // The handle to the socket for the current connection, if one exists. 154 // The handle to the socket for the current connection, if one exists.
155 net::ClientSocketHandle socket_handle_; 155 net::ClientSocketHandle socket_handle_;
156 // Current backoff entry. 156 // Current backoff entry.
157 std::unique_ptr<net::BackoffEntry> backoff_entry_; 157 std::unique_ptr<net::BackoffEntry> backoff_entry_;
158 // Backoff entry from previous connection attempt. Updated on each login 158 // Backoff entry from previous connection attempt. Updated on each login
159 // completion. 159 // completion.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 ConnectionListener* listener_; 199 ConnectionListener* listener_;
200 200
201 base::WeakPtrFactory<ConnectionFactoryImpl> weak_ptr_factory_; 201 base::WeakPtrFactory<ConnectionFactoryImpl> weak_ptr_factory_;
202 202
203 DISALLOW_COPY_AND_ASSIGN(ConnectionFactoryImpl); 203 DISALLOW_COPY_AND_ASSIGN(ConnectionFactoryImpl);
204 }; 204 };
205 205
206 } // namespace gcm 206 } // namespace gcm
207 207
208 #endif // GOOGLE_APIS_GCM_ENGINE_CONNECTION_FACTORY_IMPL_H_ 208 #endif // GOOGLE_APIS_GCM_ENGINE_CONNECTION_FACTORY_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698