| 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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 | 404 |
| 405 one_click_signin_rejected_email_list_.Init( | 405 one_click_signin_rejected_email_list_.Init( |
| 406 prefs::kReverseAutologinRejectedEmailList, pref_service); | 406 prefs::kReverseAutologinRejectedEmailList, pref_service); |
| 407 one_click_signin_rejected_email_list_.MoveToThread(io_message_loop_proxy); | 407 one_click_signin_rejected_email_list_.MoveToThread(io_message_loop_proxy); |
| 408 | 408 |
| 409 sync_disabled_.Init(prefs::kSyncManaged, pref_service); | 409 sync_disabled_.Init(prefs::kSyncManaged, pref_service); |
| 410 sync_disabled_.MoveToThread(io_message_loop_proxy); | 410 sync_disabled_.MoveToThread(io_message_loop_proxy); |
| 411 | 411 |
| 412 signin_allowed_.Init(prefs::kSigninAllowed, pref_service); | 412 signin_allowed_.Init(prefs::kSigninAllowed, pref_service); |
| 413 signin_allowed_.MoveToThread(io_message_loop_proxy); | 413 signin_allowed_.MoveToThread(io_message_loop_proxy); |
| 414 |
| 415 network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, |
| 416 pref_service); |
| 417 network_prediction_enabled_.MoveToThread(io_message_loop_proxy); |
| 414 } | 418 } |
| 415 | 419 |
| 416 quick_check_enabled_.Init(prefs::kQuickCheckEnabled, | 420 quick_check_enabled_.Init(prefs::kQuickCheckEnabled, |
| 417 local_state_pref_service); | 421 local_state_pref_service); |
| 418 quick_check_enabled_.MoveToThread(io_message_loop_proxy); | 422 quick_check_enabled_.MoveToThread(io_message_loop_proxy); |
| 419 | 423 |
| 420 media_device_id_salt_.reset(new MediaDeviceIDSalt(pref_service, | 424 media_device_id_salt_.reset(new MediaDeviceIDSalt(pref_service, |
| 421 is_incognito())); | 425 is_incognito())); |
| 422 | 426 |
| 423 #if defined(OS_CHROMEOS) | 427 #if defined(OS_CHROMEOS) |
| (...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1065 enable_referrers_.Destroy(); | 1069 enable_referrers_.Destroy(); |
| 1066 enable_do_not_track_.Destroy(); | 1070 enable_do_not_track_.Destroy(); |
| 1067 force_safesearch_.Destroy(); | 1071 force_safesearch_.Destroy(); |
| 1068 #if !defined(OS_CHROMEOS) | 1072 #if !defined(OS_CHROMEOS) |
| 1069 enable_metrics_.Destroy(); | 1073 enable_metrics_.Destroy(); |
| 1070 #endif | 1074 #endif |
| 1071 safe_browsing_enabled_.Destroy(); | 1075 safe_browsing_enabled_.Destroy(); |
| 1072 printing_enabled_.Destroy(); | 1076 printing_enabled_.Destroy(); |
| 1073 sync_disabled_.Destroy(); | 1077 sync_disabled_.Destroy(); |
| 1074 signin_allowed_.Destroy(); | 1078 signin_allowed_.Destroy(); |
| 1079 network_prediction_enabled_.Destroy(); |
| 1075 quick_check_enabled_.Destroy(); | 1080 quick_check_enabled_.Destroy(); |
| 1076 if (media_device_id_salt_) | 1081 if (media_device_id_salt_) |
| 1077 media_device_id_salt_->ShutdownOnUIThread(); | 1082 media_device_id_salt_->ShutdownOnUIThread(); |
| 1078 session_startup_pref_.Destroy(); | 1083 session_startup_pref_.Destroy(); |
| 1079 #if defined(ENABLE_CONFIGURATION_POLICY) | 1084 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 1080 if (url_blacklist_manager_) | 1085 if (url_blacklist_manager_) |
| 1081 url_blacklist_manager_->ShutdownOnUIThread(); | 1086 url_blacklist_manager_->ShutdownOnUIThread(); |
| 1082 #endif | 1087 #endif |
| 1083 if (chrome_http_user_agent_settings_) | 1088 if (chrome_http_user_agent_settings_) |
| 1084 chrome_http_user_agent_settings_->CleanupOnUIThread(); | 1089 chrome_http_user_agent_settings_->CleanupOnUIThread(); |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1123 void ProfileIOData::SetCookieSettingsForTesting( | 1128 void ProfileIOData::SetCookieSettingsForTesting( |
| 1124 CookieSettings* cookie_settings) { | 1129 CookieSettings* cookie_settings) { |
| 1125 DCHECK(!cookie_settings_.get()); | 1130 DCHECK(!cookie_settings_.get()); |
| 1126 cookie_settings_ = cookie_settings; | 1131 cookie_settings_ = cookie_settings; |
| 1127 } | 1132 } |
| 1128 | 1133 |
| 1129 void ProfileIOData::set_signin_names_for_testing( | 1134 void ProfileIOData::set_signin_names_for_testing( |
| 1130 SigninNamesOnIOThread* signin_names) { | 1135 SigninNamesOnIOThread* signin_names) { |
| 1131 signin_names_.reset(signin_names); | 1136 signin_names_.reset(signin_names); |
| 1132 } | 1137 } |
| OLD | NEW |