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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | Annotate | Revision Log
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 #include "chrome/browser/net/chrome_network_delegate.h" 5 #include "chrome/browser/net/chrome_network_delegate.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/prefs/pref_service.h"
13 #include "base/prefs/public/pref_member.h" 14 #include "base/prefs/public/pref_member.h"
14 #include "base/string_split.h" 15 #include "base/string_split.h"
15 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
16 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/content_settings/cookie_settings.h" 18 #include "chrome/browser/content_settings/cookie_settings.h"
18 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 19 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
19 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
20 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 21 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
21 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 22 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
22 #include "chrome/browser/extensions/event_router_forwarder.h" 23 #include "chrome/browser/extensions/event_router_forwarder.h"
23 #include "chrome/browser/extensions/extension_info_map.h" 24 #include "chrome/browser/extensions/extension_info_map.h"
24 #include "chrome/browser/extensions/extension_process_manager.h" 25 #include "chrome/browser/extensions/extension_process_manager.h"
25 #include "chrome/browser/extensions/extension_system.h" 26 #include "chrome/browser/extensions/extension_system.h"
26 #include "chrome/browser/google/google_util.h" 27 #include "chrome/browser/google/google_util.h"
27 #include "chrome/browser/net/connect_interceptor.h" 28 #include "chrome/browser/net/connect_interceptor.h"
28 #include "chrome/browser/net/load_time_stats.h" 29 #include "chrome/browser/net/load_time_stats.h"
29 #include "chrome/browser/performance_monitor/performance_monitor.h" 30 #include "chrome/browser/performance_monitor/performance_monitor.h"
30 #include "chrome/browser/prefs/pref_service.h"
31 #include "chrome/browser/profiles/profile_manager.h" 31 #include "chrome/browser/profiles/profile_manager.h"
32 #include "chrome/browser/task_manager/task_manager.h" 32 #include "chrome/browser/task_manager/task_manager.h"
33 #include "chrome/common/pref_names.h" 33 #include "chrome/common/pref_names.h"
34 #include "chrome/common/url_constants.h" 34 #include "chrome/common/url_constants.h"
35 #include "content/public/browser/browser_thread.h" 35 #include "content/public/browser/browser_thread.h"
36 #include "content/public/browser/render_view_host.h" 36 #include "content/public/browser/render_view_host.h"
37 #include "content/public/browser/resource_request_info.h" 37 #include "content/public/browser/resource_request_info.h"
38 #include "extensions/common/constants.h" 38 #include "extensions/common/constants.h"
39 #include "net/base/host_port_pair.h" 39 #include "net/base/host_port_pair.h"
40 #include "net/base/net_errors.h" 40 #include "net/base/net_errors.h"
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 672
673 void ChromeNetworkDelegate::AccumulateContentLength( 673 void ChromeNetworkDelegate::AccumulateContentLength(
674 int64 received_content_length, int64 original_content_length) { 674 int64 received_content_length, int64 original_content_length) {
675 DCHECK_GE(received_content_length, 0); 675 DCHECK_GE(received_content_length, 0);
676 DCHECK_GE(original_content_length, 0); 676 DCHECK_GE(original_content_length, 0);
677 StoreAccumulatedContentLength(received_content_length, 677 StoreAccumulatedContentLength(received_content_length,
678 original_content_length); 678 original_content_length);
679 received_content_length_ += received_content_length; 679 received_content_length_ += received_content_length;
680 original_content_length_ += original_content_length; 680 original_content_length_ += original_content_length;
681 } 681 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_http_user_agent_settings.cc ('k') | chrome/browser/net/cookie_policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698