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

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

Issue 11027017: Move ManagedMode classes to chrome/browser/managed_mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 1 month 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 "base/base_paths.h" 7 #include "base/base_paths.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 "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 22 matching lines...) Expand all
33 #include "net/base/net_errors.h" 33 #include "net/base/net_errors.h"
34 #include "net/base/net_log.h" 34 #include "net/base/net_log.h"
35 #include "net/cookies/canonical_cookie.h" 35 #include "net/cookies/canonical_cookie.h"
36 #include "net/cookies/cookie_options.h" 36 #include "net/cookies/cookie_options.h"
37 #include "net/http/http_request_headers.h" 37 #include "net/http/http_request_headers.h"
38 #include "net/http/http_response_headers.h" 38 #include "net/http/http_response_headers.h"
39 #include "net/socket_stream/socket_stream.h" 39 #include "net/socket_stream/socket_stream.h"
40 #include "net/url_request/url_request.h" 40 #include "net/url_request/url_request.h"
41 41
42 #if !defined(OS_ANDROID) 42 #if !defined(OS_ANDROID)
43 #include "chrome/browser/managed_mode_url_filter.h" 43 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
44 #endif 44 #endif
45 45
46 #if defined(OS_CHROMEOS) 46 #if defined(OS_CHROMEOS)
47 #include "base/chromeos/chromeos_version.h" 47 #include "base/chromeos/chromeos_version.h"
48 #include "base/command_line.h" 48 #include "base/command_line.h"
49 #include "chrome/common/chrome_switches.h" 49 #include "chrome/common/chrome_switches.h"
50 #endif 50 #endif
51 51
52 #if defined(ENABLE_CONFIGURATION_POLICY) 52 #if defined(ENABLE_CONFIGURATION_POLICY)
53 #include "chrome/browser/policy/url_blacklist_manager.h" 53 #include "chrome/browser/policy/url_blacklist_manager.h"
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 563
564 void ChromeNetworkDelegate::AccumulateContentLength( 564 void ChromeNetworkDelegate::AccumulateContentLength(
565 int64 received_content_length, int64 original_content_length) { 565 int64 received_content_length, int64 original_content_length) {
566 DCHECK_GE(received_content_length, 0); 566 DCHECK_GE(received_content_length, 0);
567 DCHECK_GE(original_content_length, 0); 567 DCHECK_GE(original_content_length, 0);
568 StoreAccumulatedContentLength(received_content_length, 568 StoreAccumulatedContentLength(received_content_length,
569 original_content_length); 569 original_content_length);
570 received_content_length_ += received_content_length; 570 received_content_length_ += received_content_length;
571 original_content_length_ += original_content_length; 571 original_content_length_ += original_content_length;
572 } 572 }
OLDNEW
« no previous file with comments | « chrome/browser/managed_mode_url_filter_unittest.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698