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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.h

Issue 1465503002: Revert of CHECK that URLRequestJobs are not orphaned while blocked by extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make git do the revert Created 5 years 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 #ifndef CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_
6 #define CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_ 6 #define CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 GURL* allowed_unsafe_redirect_url) override; 159 GURL* allowed_unsafe_redirect_url) override;
160 void OnBeforeRedirect(net::URLRequest* request, 160 void OnBeforeRedirect(net::URLRequest* request,
161 const GURL& new_location) override; 161 const GURL& new_location) override;
162 void OnResponseStarted(net::URLRequest* request) override; 162 void OnResponseStarted(net::URLRequest* request) override;
163 void OnNetworkBytesReceived(net::URLRequest* request, 163 void OnNetworkBytesReceived(net::URLRequest* request,
164 int64_t bytes_received) override; 164 int64_t bytes_received) override;
165 void OnNetworkBytesSent(net::URLRequest* request, 165 void OnNetworkBytesSent(net::URLRequest* request,
166 int64_t bytes_sent) override; 166 int64_t bytes_sent) override;
167 void OnCompleted(net::URLRequest* request, bool started) override; 167 void OnCompleted(net::URLRequest* request, bool started) override;
168 void OnURLRequestDestroyed(net::URLRequest* request) override; 168 void OnURLRequestDestroyed(net::URLRequest* request) override;
169 void OnURLRequestJobOrphaned(net::URLRequest* request) override;
170 void OnPACScriptError(int line_number, const base::string16& error) override; 169 void OnPACScriptError(int line_number, const base::string16& error) override;
171 net::NetworkDelegate::AuthRequiredResponse OnAuthRequired( 170 net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(
172 net::URLRequest* request, 171 net::URLRequest* request,
173 const net::AuthChallengeInfo& auth_info, 172 const net::AuthChallengeInfo& auth_info,
174 const AuthCallback& callback, 173 const AuthCallback& callback,
175 net::AuthCredentials* credentials) override; 174 net::AuthCredentials* credentials) override;
176 bool OnCanGetCookies(const net::URLRequest& request, 175 bool OnCanGetCookies(const net::URLRequest& request,
177 const net::CookieList& cookie_list) override; 176 const net::CookieList& cookie_list) override;
178 bool OnCanSetCookie(const net::URLRequest& request, 177 bool OnCanSetCookie(const net::URLRequest& request,
179 const std::string& cookie_line, 178 const std::string& cookie_line,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 226
228 // Aggregates and reports network usage. 227 // Aggregates and reports network usage.
229 data_usage::DataUseAggregator* data_use_aggregator_; 228 data_usage::DataUseAggregator* data_use_aggregator_;
230 // Controls whether network usage is reported as being off the record. 229 // Controls whether network usage is reported as being off the record.
231 bool is_data_usage_off_the_record_; 230 bool is_data_usage_off_the_record_;
232 231
233 DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate); 232 DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate);
234 }; 233 };
235 234
236 #endif // CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_ 235 #endif // CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_extensions_network_delegate.cc ('k') | chrome/browser/net/chrome_network_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698