OLD | NEW |
---|---|
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/net/chrome_network_delegate.h" | 5 #include "chrome/browser/net/chrome_network_delegate.h" |
6 | 6 |
7 #include "base/base64.h" | 7 #include "base/base64.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
11 #include "chrome/browser/content_settings/cookie_settings.h" | 11 #include "chrome/browser/content_settings/cookie_settings.h" |
12 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 12 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
13 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 13 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
14 #include "chrome/browser/extensions/api/proxy/proxy_api.h" | 14 #include "chrome/browser/extensions/api/proxy/proxy_api.h" |
15 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 15 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
16 #include "chrome/browser/extensions/extension_event_router_forwarder.h" | 16 #include "chrome/browser/extensions/extension_event_router_forwarder.h" |
17 #include "chrome/browser/extensions/extension_info_map.h" | 17 #include "chrome/browser/extensions/extension_info_map.h" |
18 #include "chrome/browser/extensions/extension_process_manager.h" | 18 #include "chrome/browser/extensions/extension_process_manager.h" |
19 #include "chrome/browser/prefs/pref_member.h" | 19 #include "chrome/browser/prefs/pref_member.h" |
20 #include "chrome/browser/profiles/profile_manager.h" | 20 #include "chrome/browser/profiles/profile_manager.h" |
21 #include "chrome/browser/task_manager/task_manager.h" | |
22 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
23 #include "content/public/browser/browser_thread.h" | 22 #include "content/public/browser/browser_thread.h" |
24 #include "content/public/browser/render_view_host.h" | 23 #include "content/public/browser/render_view_host.h" |
25 #include "content/public/browser/resource_request_info.h" | 24 #include "content/public/browser/resource_request_info.h" |
26 #include "net/base/host_port_pair.h" | 25 #include "net/base/host_port_pair.h" |
27 #include "net/base/dns_util.h" | 26 #include "net/base/dns_util.h" |
28 #include "net/base/dnsrr_resolver.h" | 27 #include "net/base/dnsrr_resolver.h" |
29 #include "net/base/net_errors.h" | 28 #include "net/base/net_errors.h" |
30 #include "net/base/net_log.h" | 29 #include "net/base/net_log.h" |
31 #include "net/base/public_key_hashes.h" | 30 #include "net/base/public_key_hashes.h" |
32 #include "net/cookies/cookie_monster.h" | 31 #include "net/cookies/cookie_monster.h" |
33 #include "net/http/http_request_headers.h" | 32 #include "net/http/http_request_headers.h" |
34 #include "net/http/http_response_headers.h" | 33 #include "net/http/http_response_headers.h" |
35 #include "net/url_request/url_request.h" | 34 #include "net/url_request/url_request.h" |
36 | 35 |
37 #if defined(ENABLE_CONFIGURATION_POLICY) | 36 #if defined(ENABLE_CONFIGURATION_POLICY) |
38 #include "chrome/browser/policy/url_blacklist_manager.h" | 37 #include "chrome/browser/policy/url_blacklist_manager.h" |
39 #endif | 38 #endif |
40 | 39 |
40 #if defined(ENABLE_TASK_MANAGER) | |
jam
2012/04/02 15:49:28
nit: you don't need this ifdef, so don't add it an
| |
41 #include "chrome/browser/task_manager/task_manager.h" | |
42 #endif // defined(ENABLE_TASK_MANAGER) | |
43 | |
41 using content::BrowserThread; | 44 using content::BrowserThread; |
42 using content::RenderViewHost; | 45 using content::RenderViewHost; |
43 using content::ResourceRequestInfo; | 46 using content::ResourceRequestInfo; |
44 | 47 |
45 namespace { | 48 namespace { |
46 | 49 |
47 // If the |request| failed due to problems with a proxy, forward the error to | 50 // If the |request| failed due to problems with a proxy, forward the error to |
48 // the proxy extension API. | 51 // the proxy extension API. |
49 void ForwardProxyErrors(net::URLRequest* request, | 52 void ForwardProxyErrors(net::URLRequest* request, |
50 ExtensionEventRouterForwarder* event_router, | 53 ExtensionEventRouterForwarder* event_router, |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
298 "wibble.comodoca.com", net::kDNS_TXT, 0 /* flags */, | 301 "wibble.comodoca.com", net::kDNS_TXT, 0 /* flags */, |
299 Bind(RecordComodoDNSResult, base::Owned(response), start_time), | 302 Bind(RecordComodoDNSResult, base::Owned(response), start_time), |
300 response, 0 /* priority */, | 303 response, 0 /* priority */, |
301 request->net_log()); | 304 request->net_log()); |
302 } | 305 } |
303 } | 306 } |
304 } | 307 } |
305 | 308 |
306 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request, | 309 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request, |
307 int bytes_read) { | 310 int bytes_read) { |
311 #if defined(ENABLE_TASK_MANAGER) | |
308 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read); | 312 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read); |
313 #endif // defined(ENABLE_TASK_MANAGER) | |
309 } | 314 } |
310 | 315 |
311 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request, | 316 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request, |
312 bool started) { | 317 bool started) { |
313 if (request->status().status() == net::URLRequestStatus::SUCCESS || | 318 if (request->status().status() == net::URLRequestStatus::SUCCESS || |
314 request->status().status() == net::URLRequestStatus::HANDLED_EXTERNALLY) { | 319 request->status().status() == net::URLRequestStatus::HANDLED_EXTERNALLY) { |
315 bool is_redirect = request->response_headers() && | 320 bool is_redirect = request->response_headers() && |
316 net::HttpResponseHeaders::IsRedirectResponseCode( | 321 net::HttpResponseHeaders::IsRedirectResponseCode( |
317 request->response_headers()->response_code()); | 322 request->response_headers()->response_code()); |
318 if (!is_redirect) { | 323 if (!is_redirect) { |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
397 request, &render_process_id, &render_view_id)) { | 402 request, &render_process_id, &render_view_id)) { |
398 BrowserThread::PostTask( | 403 BrowserThread::PostTask( |
399 BrowserThread::UI, FROM_HERE, | 404 BrowserThread::UI, FROM_HERE, |
400 base::Bind(&TabSpecificContentSettings::CookieChanged, | 405 base::Bind(&TabSpecificContentSettings::CookieChanged, |
401 render_process_id, render_view_id, | 406 render_process_id, render_view_id, |
402 request->url(), cookie_line, *options, !allow)); | 407 request->url(), cookie_line, *options, !allow)); |
403 } | 408 } |
404 | 409 |
405 return allow; | 410 return allow; |
406 } | 411 } |
OLD | NEW |