| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdlib.h> | 8 #include <stdlib.h> |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 void ChromeNetworkDelegate::InitializePrefsOnUIThread( | 334 void ChromeNetworkDelegate::InitializePrefsOnUIThread( |
| 335 BooleanPrefMember* enable_referrers, | 335 BooleanPrefMember* enable_referrers, |
| 336 BooleanPrefMember* enable_do_not_track, | 336 BooleanPrefMember* enable_do_not_track, |
| 337 BooleanPrefMember* force_google_safe_search, | 337 BooleanPrefMember* force_google_safe_search, |
| 338 BooleanPrefMember* force_youtube_safety_mode, | 338 BooleanPrefMember* force_youtube_safety_mode, |
| 339 StringPrefMember* allowed_domains_for_apps, | 339 StringPrefMember* allowed_domains_for_apps, |
| 340 PrefService* pref_service) { | 340 PrefService* pref_service) { |
| 341 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 341 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 342 enable_referrers->Init(prefs::kEnableReferrers, pref_service); | 342 enable_referrers->Init(prefs::kEnableReferrers, pref_service); |
| 343 enable_referrers->MoveToThread( | 343 enable_referrers->MoveToThread( |
| 344 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 344 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 345 if (enable_do_not_track) { | 345 if (enable_do_not_track) { |
| 346 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service); | 346 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service); |
| 347 enable_do_not_track->MoveToThread( | 347 enable_do_not_track->MoveToThread( |
| 348 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 348 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 349 } | 349 } |
| 350 if (force_google_safe_search) { | 350 if (force_google_safe_search) { |
| 351 force_google_safe_search->Init(prefs::kForceGoogleSafeSearch, pref_service); | 351 force_google_safe_search->Init(prefs::kForceGoogleSafeSearch, pref_service); |
| 352 force_google_safe_search->MoveToThread( | 352 force_google_safe_search->MoveToThread( |
| 353 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 353 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 354 } | 354 } |
| 355 if (force_youtube_safety_mode) { | 355 if (force_youtube_safety_mode) { |
| 356 force_youtube_safety_mode->Init(prefs::kForceYouTubeSafetyMode, | 356 force_youtube_safety_mode->Init(prefs::kForceYouTubeSafetyMode, |
| 357 pref_service); | 357 pref_service); |
| 358 force_youtube_safety_mode->MoveToThread( | 358 force_youtube_safety_mode->MoveToThread( |
| 359 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 359 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 360 } | 360 } |
| 361 if (allowed_domains_for_apps) { | 361 if (allowed_domains_for_apps) { |
| 362 allowed_domains_for_apps->Init(prefs::kAllowedDomainsForApps, pref_service); | 362 allowed_domains_for_apps->Init(prefs::kAllowedDomainsForApps, pref_service); |
| 363 allowed_domains_for_apps->MoveToThread( | 363 allowed_domains_for_apps->MoveToThread( |
| 364 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 364 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 365 } | 365 } |
| 366 } | 366 } |
| 367 | 367 |
| 368 // static | 368 // static |
| 369 void ChromeNetworkDelegate::AllowAccessToAllFiles() { | 369 void ChromeNetworkDelegate::AllowAccessToAllFiles() { |
| 370 g_allow_file_access_ = true; | 370 g_allow_file_access_ = true; |
| 371 } | 371 } |
| 372 | 372 |
| 373 int ChromeNetworkDelegate::OnBeforeURLRequest( | 373 int ChromeNetworkDelegate::OnBeforeURLRequest( |
| 374 net::URLRequest* request, | 374 net::URLRequest* request, |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 749 if (!data_use_aggregator_) | 749 if (!data_use_aggregator_) |
| 750 return; | 750 return; |
| 751 | 751 |
| 752 if (is_data_usage_off_the_record_) { | 752 if (is_data_usage_off_the_record_) { |
| 753 data_use_aggregator_->ReportOffTheRecordDataUse(tx_bytes, rx_bytes); | 753 data_use_aggregator_->ReportOffTheRecordDataUse(tx_bytes, rx_bytes); |
| 754 return; | 754 return; |
| 755 } | 755 } |
| 756 | 756 |
| 757 data_use_aggregator_->ReportDataUse(request, tx_bytes, rx_bytes); | 757 data_use_aggregator_->ReportDataUse(request, tx_bytes, rx_bytes); |
| 758 } | 758 } |
| OLD | NEW |