| 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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); | 307 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); |
| 308 policy::DeviceStatusCollector::RegisterPrefs(registry); | 308 policy::DeviceStatusCollector::RegisterPrefs(registry); |
| 309 #endif | 309 #endif |
| 310 | 310 |
| 311 #if defined(OS_MACOSX) | 311 #if defined(OS_MACOSX) |
| 312 confirm_quit::RegisterLocalState(registry); | 312 confirm_quit::RegisterLocalState(registry); |
| 313 #endif | 313 #endif |
| 314 | 314 |
| 315 #if defined(OS_WIN) | 315 #if defined(OS_WIN) |
| 316 app_metro_launch::RegisterPrefs(registry); | 316 app_metro_launch::RegisterPrefs(registry); |
| 317 PasswordManager::RegisterLocalPrefs(registry); |
| 317 #endif | 318 #endif |
| 318 } | 319 } |
| 319 | 320 |
| 320 // Register prefs applicable to all profiles. | 321 // Register prefs applicable to all profiles. |
| 321 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 322 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 322 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); | 323 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); |
| 323 // User prefs. Please keep this list alphabetized. | 324 // User prefs. Please keep this list alphabetized. |
| 324 AlternateErrorPageTabObserver::RegisterProfilePrefs(registry); | 325 AlternateErrorPageTabObserver::RegisterProfilePrefs(registry); |
| 325 apps::RegisterProfilePrefs(registry); | 326 apps::RegisterProfilePrefs(registry); |
| 326 #if !defined(OS_ANDROID) | 327 #if !defined(OS_ANDROID) |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 565 } | 566 } |
| 566 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 567 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 567 | 568 |
| 568 current_version |= GOOGLE_URL_TRACKER_PREFS; | 569 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 570 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 570 current_version); | 571 current_version); |
| 571 } | 572 } |
| 572 } | 573 } |
| 573 | 574 |
| 574 } // namespace chrome | 575 } // namespace chrome |
| OLD | NEW |