| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/prefs/browser_prefs.h" | 5 #include "chrome/browser/prefs/browser_prefs.h" |
| 6 | 6 |
| 7 #include "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
| 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 9 #include "chrome/browser/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 NO_PREFS = 0, | 137 NO_PREFS = 0, |
| 138 DNS_PREFS = 1 << 0, | 138 DNS_PREFS = 1 << 0, |
| 139 WINDOWS_PREFS = 1 << 1, | 139 WINDOWS_PREFS = 1 << 1, |
| 140 GOOGLE_URL_TRACKER_PREFS = 1 << 2, | 140 GOOGLE_URL_TRACKER_PREFS = 1 << 2, |
| 141 }; | 141 }; |
| 142 | 142 |
| 143 } // namespace | 143 } // namespace |
| 144 | 144 |
| 145 namespace chrome { | 145 namespace chrome { |
| 146 | 146 |
| 147 void RegisterLocalState(PrefService* local_state) { | 147 void RegisterLocalState(PrefServiceSimple* local_state) { |
| 148 // Prefs in Local State. | 148 // Prefs in Local State. |
| 149 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 149 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
| 150 | 150 |
| 151 // Please keep this list alphabetized. | 151 // Please keep this list alphabetized. |
| 152 browser_shutdown::RegisterPrefs(local_state); | 152 browser_shutdown::RegisterPrefs(local_state); |
| 153 chrome::RegisterScreenshotPrefs(local_state); | 153 chrome::RegisterScreenshotPrefs(local_state); |
| 154 chrome_variations::VariationsService::RegisterPrefs(local_state); | 154 chrome_variations::VariationsService::RegisterPrefs(local_state); |
| 155 ExternalProtocolHandler::RegisterPrefs(local_state); | 155 ExternalProtocolHandler::RegisterPrefs(local_state); |
| 156 geolocation::RegisterPrefs(local_state); | 156 geolocation::RegisterPrefs(local_state); |
| 157 IntranetRedirectDetector::RegisterPrefs(local_state); | 157 IntranetRedirectDetector::RegisterPrefs(local_state); |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 chromeos::WizardController::RegisterPrefs(local_state); | 211 chromeos::WizardController::RegisterPrefs(local_state); |
| 212 policy::AutoEnrollmentClient::RegisterPrefs(local_state); | 212 policy::AutoEnrollmentClient::RegisterPrefs(local_state); |
| 213 policy::DeviceStatusCollector::RegisterPrefs(local_state); | 213 policy::DeviceStatusCollector::RegisterPrefs(local_state); |
| 214 #endif | 214 #endif |
| 215 | 215 |
| 216 #if defined(OS_MACOSX) | 216 #if defined(OS_MACOSX) |
| 217 confirm_quit::RegisterLocalState(local_state); | 217 confirm_quit::RegisterLocalState(local_state); |
| 218 #endif | 218 #endif |
| 219 } | 219 } |
| 220 | 220 |
| 221 void RegisterUserPrefs(PrefService* user_prefs) { | 221 void RegisterUserPrefs(PrefServiceSyncable* user_prefs) { |
| 222 // User prefs. Please keep this list alphabetized. | 222 // User prefs. Please keep this list alphabetized. |
| 223 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); | 223 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); |
| 224 AutofillManager::RegisterUserPrefs(user_prefs); | 224 AutofillManager::RegisterUserPrefs(user_prefs); |
| 225 BookmarkPromptPrefs::RegisterUserPrefs(user_prefs); | 225 BookmarkPromptPrefs::RegisterUserPrefs(user_prefs); |
| 226 bookmark_utils::RegisterUserPrefs(user_prefs); | 226 bookmark_utils::RegisterUserPrefs(user_prefs); |
| 227 BrowserInstantController::RegisterUserPrefs(user_prefs); | 227 BrowserInstantController::RegisterUserPrefs(user_prefs); |
| 228 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); | 228 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); |
| 229 ChromeVersionService::RegisterUserPrefs(user_prefs); | 229 ChromeVersionService::RegisterUserPrefs(user_prefs); |
| 230 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); | 230 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); |
| 231 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); | 231 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 } | 366 } |
| 367 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 367 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 368 | 368 |
| 369 current_version |= GOOGLE_URL_TRACKER_PREFS; | 369 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 370 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 370 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 371 current_version); | 371 current_version); |
| 372 } | 372 } |
| 373 } | 373 } |
| 374 | 374 |
| 375 } // namespace chrome | 375 } // namespace chrome |
| OLD | NEW |