| 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" | 177 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" |
| 178 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 178 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 179 #include "components/invalidation/invalidator_storage.h" | 179 #include "components/invalidation/invalidator_storage.h" |
| 180 #else | 180 #else |
| 181 #include "chrome/browser/extensions/default_apps.h" | 181 #include "chrome/browser/extensions/default_apps.h" |
| 182 #endif | 182 #endif |
| 183 | 183 |
| 184 #if defined(OS_MACOSX) | 184 #if defined(OS_MACOSX) |
| 185 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 185 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
| 186 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 186 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 187 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" | |
| 188 #endif | 187 #endif |
| 189 | 188 |
| 190 #if defined(OS_WIN) | 189 #if defined(OS_WIN) |
| 191 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 190 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
| 192 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" | 191 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" |
| 193 #endif | 192 #endif |
| 194 | 193 |
| 195 #if defined(TOOLKIT_VIEWS) | 194 #if defined(TOOLKIT_VIEWS) |
| 196 #include "chrome/browser/ui/browser_view_prefs.h" | 195 #include "chrome/browser/ui/browser_view_prefs.h" |
| 197 #endif | 196 #endif |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 chromeos::Preferences::RegisterProfilePrefs(registry); | 453 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 455 chromeos::proxy_config::RegisterProfilePrefs(registry); | 454 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| 456 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 455 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
| 457 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 456 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
| 458 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 457 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
| 459 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 458 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
| 460 RegisterProfilePrefs(registry); | 459 RegisterProfilePrefs(registry); |
| 461 FlagsUI::RegisterProfilePrefs(registry); | 460 FlagsUI::RegisterProfilePrefs(registry); |
| 462 #endif | 461 #endif |
| 463 | 462 |
| 464 #if defined(OS_MACOSX) | |
| 465 RegisterBrowserActionsControllerProfilePrefs(registry); | |
| 466 #endif | |
| 467 | |
| 468 #if defined(OS_WIN) | 463 #if defined(OS_WIN) |
| 469 NetworkProfileBubble::RegisterProfilePrefs(registry); | 464 NetworkProfileBubble::RegisterProfilePrefs(registry); |
| 470 #endif | 465 #endif |
| 471 | 466 |
| 472 #if defined(TOOLKIT_VIEWS) | 467 #if defined(TOOLKIT_VIEWS) |
| 473 RegisterBrowserViewProfilePrefs(registry); | 468 RegisterBrowserViewProfilePrefs(registry); |
| 474 RegisterInvertBubbleUserPrefs(registry); | 469 RegisterInvertBubbleUserPrefs(registry); |
| 475 #endif | 470 #endif |
| 476 | 471 |
| 477 #if defined(USE_ASH) | 472 #if defined(USE_ASH) |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 #if defined(OS_CHROMEOS) | 590 #if defined(OS_CHROMEOS) |
| 596 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 591 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 597 #endif | 592 #endif |
| 598 | 593 |
| 599 #if defined(TOOLKIT_VIEWS) | 594 #if defined(TOOLKIT_VIEWS) |
| 600 MigrateBrowserTabStripPrefs(local_state); | 595 MigrateBrowserTabStripPrefs(local_state); |
| 601 #endif | 596 #endif |
| 602 } | 597 } |
| 603 | 598 |
| 604 } // namespace chrome | 599 } // namespace chrome |
| OLD | NEW |