| 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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 #if defined(OS_ANDROID) | 172 #if defined(OS_ANDROID) |
| 173 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h" | 173 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h" |
| 174 #else | 174 #else |
| 175 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" | 175 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" |
| 176 #endif | 176 #endif |
| 177 | 177 |
| 178 #if defined(ENABLE_PLUGIN_INSTALLATION) | 178 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 179 #include "chrome/browser/plugins/plugins_resource_service.h" | 179 #include "chrome/browser/plugins/plugins_resource_service.h" |
| 180 #endif | 180 #endif |
| 181 | 181 |
| 182 #if defined(OS_WIN) |
| 183 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
| 184 #endif |
| 185 |
| 182 namespace { | 186 namespace { |
| 183 | 187 |
| 184 enum MigratedPreferences { | 188 enum MigratedPreferences { |
| 185 NO_PREFS = 0, | 189 NO_PREFS = 0, |
| 186 DNS_PREFS = 1 << 0, | 190 DNS_PREFS = 1 << 0, |
| 187 WINDOWS_PREFS = 1 << 1, | 191 WINDOWS_PREFS = 1 << 1, |
| 188 GOOGLE_URL_TRACKER_PREFS = 1 << 2, | 192 GOOGLE_URL_TRACKER_PREFS = 1 << 2, |
| 189 }; | 193 }; |
| 190 | 194 |
| 191 // A previous feature (see | 195 // A previous feature (see |
| (...skipping 15 matching lines...) Expand all Loading... |
| 207 } // namespace | 211 } // namespace |
| 208 | 212 |
| 209 namespace chrome { | 213 namespace chrome { |
| 210 | 214 |
| 211 void RegisterLocalState(PrefRegistrySimple* registry) { | 215 void RegisterLocalState(PrefRegistrySimple* registry) { |
| 212 // Prefs in Local State. | 216 // Prefs in Local State. |
| 213 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 217 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
| 214 | 218 |
| 215 // Please keep this list alphabetized. | 219 // Please keep this list alphabetized. |
| 216 AppListService::RegisterPrefs(registry); | 220 AppListService::RegisterPrefs(registry); |
| 217 apps::RegisterPrefs(registry); | 221 #if defined(OS_WIN) |
| 222 app_metro_launch::RegisterPrefs(registry); |
| 223 #endif |
| 218 browser_shutdown::RegisterPrefs(registry); | 224 browser_shutdown::RegisterPrefs(registry); |
| 219 BrowserProcessImpl::RegisterPrefs(registry); | 225 BrowserProcessImpl::RegisterPrefs(registry); |
| 220 RegisterScreenshotPrefs(registry); | 226 RegisterScreenshotPrefs(registry); |
| 221 ExternalProtocolHandler::RegisterPrefs(registry); | 227 ExternalProtocolHandler::RegisterPrefs(registry); |
| 222 FlagsUI::RegisterPrefs(registry); | 228 FlagsUI::RegisterPrefs(registry); |
| 223 geolocation::RegisterPrefs(registry); | 229 geolocation::RegisterPrefs(registry); |
| 224 GLStringManager::RegisterPrefs(registry); | 230 GLStringManager::RegisterPrefs(registry); |
| 225 GpuModeManager::RegisterPrefs(registry); | 231 GpuModeManager::RegisterPrefs(registry); |
| 226 IntranetRedirectDetector::RegisterPrefs(registry); | 232 IntranetRedirectDetector::RegisterPrefs(registry); |
| 227 IOThread::RegisterPrefs(registry); | 233 IOThread::RegisterPrefs(registry); |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 } | 566 } |
| 561 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 567 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 562 | 568 |
| 563 current_version |= GOOGLE_URL_TRACKER_PREFS; | 569 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 564 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 570 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 565 current_version); | 571 current_version); |
| 566 } | 572 } |
| 567 } | 573 } |
| 568 | 574 |
| 569 } // namespace chrome | 575 } // namespace chrome |
| OLD | NEW |