| 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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); | 303 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); |
| 304 policy::DeviceStatusCollector::RegisterPrefs(registry); | 304 policy::DeviceStatusCollector::RegisterPrefs(registry); |
| 305 #endif | 305 #endif |
| 306 | 306 |
| 307 #if defined(OS_MACOSX) | 307 #if defined(OS_MACOSX) |
| 308 confirm_quit::RegisterLocalState(registry); | 308 confirm_quit::RegisterLocalState(registry); |
| 309 #endif | 309 #endif |
| 310 | 310 |
| 311 #if defined(OS_WIN) | 311 #if defined(OS_WIN) |
| 312 app_metro_launch::RegisterPrefs(registry); | 312 app_metro_launch::RegisterPrefs(registry); |
| 313 PasswordManager::RegisterLocalPrefs(registry); |
| 313 #endif | 314 #endif |
| 314 | 315 |
| 315 #if defined(TOOLKIT_VIEWS) | 316 #if defined(TOOLKIT_VIEWS) |
| 316 RegisterBrowserViewPrefs(registry); | 317 RegisterBrowserViewPrefs(registry); |
| 317 RegisterTabStripLayoutTypePrefs(registry); | 318 RegisterTabStripLayoutTypePrefs(registry); |
| 318 #endif | 319 #endif |
| 319 } | 320 } |
| 320 | 321 |
| 321 // Register prefs applicable to all profiles. | 322 // Register prefs applicable to all profiles. |
| 322 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 323 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 } | 562 } |
| 562 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 563 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 563 | 564 |
| 564 current_version |= GOOGLE_URL_TRACKER_PREFS; | 565 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 565 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 566 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 566 current_version); | 567 current_version); |
| 567 } | 568 } |
| 568 } | 569 } |
| 569 | 570 |
| 570 } // namespace chrome | 571 } // namespace chrome |
| OLD | NEW |