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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
469 chromeos::proxy_config::RegisterProfilePrefs(registry); | 469 chromeos::proxy_config::RegisterProfilePrefs(registry); |
470 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 470 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
471 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 471 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
472 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 472 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
473 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 473 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
474 RegisterProfilePrefs(registry); | 474 RegisterProfilePrefs(registry); |
475 FlagsUI::RegisterProfilePrefs(registry); | 475 FlagsUI::RegisterProfilePrefs(registry); |
476 #endif | 476 #endif |
477 | 477 |
478 #if defined(OS_WIN) | 478 #if defined(OS_WIN) |
| 479 component_updater::RegisterProfilePrefsForSwReporter(registry); |
479 NetworkProfileBubble::RegisterProfilePrefs(registry); | 480 NetworkProfileBubble::RegisterProfilePrefs(registry); |
480 #endif | 481 #endif |
481 | 482 |
482 #if defined(TOOLKIT_VIEWS) | 483 #if defined(TOOLKIT_VIEWS) |
483 RegisterBrowserViewProfilePrefs(registry); | 484 RegisterBrowserViewProfilePrefs(registry); |
484 RegisterInvertBubbleUserPrefs(registry); | 485 RegisterInvertBubbleUserPrefs(registry); |
485 #endif | 486 #endif |
486 | 487 |
487 #if defined(USE_ASH) | 488 #if defined(USE_ASH) |
488 ash::RegisterChromeLauncherUserPrefs(registry); | 489 ash::RegisterChromeLauncherUserPrefs(registry); |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 #if defined(OS_CHROMEOS) | 615 #if defined(OS_CHROMEOS) |
615 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 616 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
616 #endif | 617 #endif |
617 | 618 |
618 #if defined(TOOLKIT_VIEWS) | 619 #if defined(TOOLKIT_VIEWS) |
619 MigrateBrowserTabStripPrefs(local_state); | 620 MigrateBrowserTabStripPrefs(local_state); |
620 #endif | 621 #endif |
621 } | 622 } |
622 | 623 |
623 } // namespace chrome | 624 } // namespace chrome |
OLD | NEW |