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/logging.h" | 7 #include "base/logging.h" |
8 #include "base/base_paths.h" | |
9 #include "base/path_service.h" | 8 #include "base/path_service.h" |
10 #include "chrome/browser/api/prefs/pref_member.h" | 9 #include "chrome/browser/api/prefs/pref_member.h" |
11 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/content_settings/cookie_settings.h" | 11 #include "chrome/browser/content_settings/cookie_settings.h" |
13 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 12 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 13 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
15 #include "chrome/browser/extensions/api/proxy/proxy_api.h" | 14 #include "chrome/browser/extensions/api/proxy/proxy_api.h" |
16 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 15 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
17 #include "chrome/browser/extensions/event_router_forwarder.h" | 16 #include "chrome/browser/extensions/event_router_forwarder.h" |
18 #include "chrome/browser/extensions/extension_info_map.h" | 17 #include "chrome/browser/extensions/extension_info_map.h" |
(...skipping 12 matching lines...) Expand all Loading... |
31 #include "net/base/net_errors.h" | 30 #include "net/base/net_errors.h" |
32 #include "net/base/net_log.h" | 31 #include "net/base/net_log.h" |
33 #include "net/cookies/canonical_cookie.h" | 32 #include "net/cookies/canonical_cookie.h" |
34 #include "net/cookies/cookie_options.h" | 33 #include "net/cookies/cookie_options.h" |
35 #include "net/http/http_request_headers.h" | 34 #include "net/http/http_request_headers.h" |
36 #include "net/http/http_response_headers.h" | 35 #include "net/http/http_response_headers.h" |
37 #include "net/socket_stream/socket_stream.h" | 36 #include "net/socket_stream/socket_stream.h" |
38 #include "net/url_request/url_request.h" | 37 #include "net/url_request/url_request.h" |
39 | 38 |
40 #if !defined(OS_ANDROID) | 39 #if !defined(OS_ANDROID) |
| 40 #include "base/base_paths_android.h" |
41 #include "chrome/browser/managed_mode_url_filter.h" | 41 #include "chrome/browser/managed_mode_url_filter.h" |
42 #endif | 42 #endif |
43 | 43 |
44 #if defined(OS_CHROMEOS) | 44 #if defined(OS_CHROMEOS) |
45 #include "base/chromeos/chromeos_version.h" | 45 #include "base/chromeos/chromeos_version.h" |
46 #include "base/command_line.h" | 46 #include "base/command_line.h" |
47 #include "chrome/common/chrome_switches.h" | 47 #include "chrome/common/chrome_switches.h" |
48 #endif | 48 #endif |
49 | 49 |
50 #if defined(ENABLE_CONFIGURATION_POLICY) | 50 #if defined(ENABLE_CONFIGURATION_POLICY) |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 #endif | 436 #endif |
437 return net::OK; | 437 return net::OK; |
438 } | 438 } |
439 | 439 |
440 void ChromeNetworkDelegate::OnRequestWaitStateChange( | 440 void ChromeNetworkDelegate::OnRequestWaitStateChange( |
441 const net::URLRequest& request, | 441 const net::URLRequest& request, |
442 RequestWaitState state) { | 442 RequestWaitState state) { |
443 if (load_time_stats_) | 443 if (load_time_stats_) |
444 load_time_stats_->OnRequestWaitStateChange(request, state); | 444 load_time_stats_->OnRequestWaitStateChange(request, state); |
445 } | 445 } |
OLD | NEW |