| 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 <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" |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 g_never_throttle_requests_ = true; | 296 g_never_throttle_requests_ = true; |
| 297 } | 297 } |
| 298 | 298 |
| 299 // static | 299 // static |
| 300 void ChromeNetworkDelegate::InitializePrefsOnUIThread( | 300 void ChromeNetworkDelegate::InitializePrefsOnUIThread( |
| 301 BooleanPrefMember* enable_referrers, | 301 BooleanPrefMember* enable_referrers, |
| 302 BooleanPrefMember* enable_do_not_track, | 302 BooleanPrefMember* enable_do_not_track, |
| 303 BooleanPrefMember* force_google_safe_search, | 303 BooleanPrefMember* force_google_safe_search, |
| 304 PrefService* pref_service) { | 304 PrefService* pref_service) { |
| 305 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 305 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 306 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); | 306 enable_referrers->Init(prefs::kEnableReferrers, pref_service); |
| 307 enable_referrers->MoveToThread( | 307 enable_referrers->MoveToThread( |
| 308 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 308 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
| 309 if (enable_do_not_track) { | 309 if (enable_do_not_track) { |
| 310 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL); | 310 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service); |
| 311 enable_do_not_track->MoveToThread( | 311 enable_do_not_track->MoveToThread( |
| 312 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 312 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
| 313 } | 313 } |
| 314 if (force_google_safe_search) { | 314 if (force_google_safe_search) { |
| 315 force_google_safe_search->Init(prefs::kForceSafeSearch, pref_service, NULL); | 315 force_google_safe_search->Init(prefs::kForceSafeSearch, pref_service); |
| 316 force_google_safe_search->MoveToThread( | 316 force_google_safe_search->MoveToThread( |
| 317 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 317 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
| 318 } | 318 } |
| 319 } | 319 } |
| 320 | 320 |
| 321 // static | 321 // static |
| 322 void ChromeNetworkDelegate::AllowAccessToAllFiles() { | 322 void ChromeNetworkDelegate::AllowAccessToAllFiles() { |
| 323 g_allow_file_access_ = true; | 323 g_allow_file_access_ = true; |
| 324 } | 324 } |
| 325 | 325 |
| (...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 | 655 |
| 656 void ChromeNetworkDelegate::AccumulateContentLength( | 656 void ChromeNetworkDelegate::AccumulateContentLength( |
| 657 int64 received_content_length, int64 original_content_length) { | 657 int64 received_content_length, int64 original_content_length) { |
| 658 DCHECK_GE(received_content_length, 0); | 658 DCHECK_GE(received_content_length, 0); |
| 659 DCHECK_GE(original_content_length, 0); | 659 DCHECK_GE(original_content_length, 0); |
| 660 StoreAccumulatedContentLength(received_content_length, | 660 StoreAccumulatedContentLength(received_content_length, |
| 661 original_content_length); | 661 original_content_length); |
| 662 received_content_length_ += received_content_length; | 662 received_content_length_ += received_content_length; |
| 663 original_content_length_ += original_content_length; | 663 original_content_length_ += original_content_length; |
| 664 } | 664 } |
| OLD | NEW |