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

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

Issue 12789006: base/prefs: Remove the public/ directory and move the files to //base/prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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 <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/base_paths.h" 11 #include "base/base_paths.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/prefs/pref_member.h"
15 #include "base/prefs/pref_service.h" 16 #include "base/prefs/pref_service.h"
16 #include "base/prefs/public/pref_member.h"
17 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
18 #include "base/strings/string_split.h" 18 #include "base/strings/string_split.h"
19 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/content_settings/cookie_settings.h" 20 #include "chrome/browser/content_settings/cookie_settings.h"
21 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 21 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
22 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 22 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
23 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 23 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
24 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 24 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
25 #include "chrome/browser/extensions/event_router_forwarder.h" 25 #include "chrome/browser/extensions/event_router_forwarder.h"
26 #include "chrome/browser/extensions/extension_info_map.h" 26 #include "chrome/browser/extensions/extension_info_map.h"
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 760
761 void ChromeNetworkDelegate::AccumulateContentLength( 761 void ChromeNetworkDelegate::AccumulateContentLength(
762 int64 received_content_length, int64 original_content_length) { 762 int64 received_content_length, int64 original_content_length) {
763 DCHECK_GE(received_content_length, 0); 763 DCHECK_GE(received_content_length, 0);
764 DCHECK_GE(original_content_length, 0); 764 DCHECK_GE(original_content_length, 0);
765 StoreAccumulatedContentLength(received_content_length, 765 StoreAccumulatedContentLength(received_content_length,
766 original_content_length); 766 original_content_length);
767 received_content_length_ += received_content_length; 767 received_content_length_ += received_content_length;
768 original_content_length_ += original_content_length; 768 original_content_length_ += original_content_length;
769 } 769 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_http_user_agent_settings.h ('k') | chrome/browser/net/chrome_network_delegate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698