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