| 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/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" | 193 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" |
| 194 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 194 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 195 #include "chromeos/audio/audio_devices_pref_handler_impl.h" | 195 #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
| 196 #include "chromeos/timezone/timezone_resolver.h" | 196 #include "chromeos/timezone/timezone_resolver.h" |
| 197 #include "components/invalidation/impl/invalidator_storage.h" | 197 #include "components/invalidation/impl/invalidator_storage.h" |
| 198 #else | 198 #else |
| 199 #include "chrome/browser/extensions/default_apps.h" | 199 #include "chrome/browser/extensions/default_apps.h" |
| 200 #endif | 200 #endif |
| 201 | 201 |
| 202 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) | 202 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
| 203 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" |
| 203 #include "chrome/browser/ui/app_list/google_now_extension.h" | 204 #include "chrome/browser/ui/app_list/google_now_extension.h" |
| 204 #endif | 205 #endif |
| 205 | 206 |
| 206 #if defined(OS_MACOSX) | 207 #if defined(OS_MACOSX) |
| 207 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 208 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
| 208 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 209 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 209 #endif | 210 #endif |
| 210 | 211 |
| 211 #if defined(OS_WIN) | 212 #if defined(OS_WIN) |
| 212 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 213 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 496 chromeos::Preferences::RegisterProfilePrefs(registry); | 497 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 497 chromeos::proxy_config::RegisterProfilePrefs(registry); | 498 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| 498 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 499 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
| 499 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 500 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
| 500 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 501 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
| 501 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 502 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
| 502 RegisterProfilePrefs(registry); | 503 RegisterProfilePrefs(registry); |
| 503 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); | 504 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); |
| 504 #endif | 505 #endif |
| 505 | 506 |
| 507 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
| 508 ArcAppListPrefs::RegisterProfilePrefs(registry); |
| 509 #endif |
| 510 |
| 506 #if defined(OS_WIN) | 511 #if defined(OS_WIN) |
| 507 component_updater::RegisterProfilePrefsForSwReporter(registry); | 512 component_updater::RegisterProfilePrefsForSwReporter(registry); |
| 508 NetworkProfileBubble::RegisterProfilePrefs(registry); | 513 NetworkProfileBubble::RegisterProfilePrefs(registry); |
| 509 #endif | 514 #endif |
| 510 | 515 |
| 511 #if defined(TOOLKIT_VIEWS) | 516 #if defined(TOOLKIT_VIEWS) |
| 512 RegisterBrowserViewProfilePrefs(registry); | 517 RegisterBrowserViewProfilePrefs(registry); |
| 513 RegisterInvertBubbleUserPrefs(registry); | 518 RegisterInvertBubbleUserPrefs(registry); |
| 514 #endif | 519 #endif |
| 515 | 520 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 // Added 11/2015. | 582 // Added 11/2015. |
| 578 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); | 583 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); |
| 579 #endif | 584 #endif |
| 580 | 585 |
| 581 // Added 12/1015. | 586 // Added 12/1015. |
| 582 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld); | 587 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld); |
| 583 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime); | 588 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime); |
| 584 } | 589 } |
| 585 | 590 |
| 586 } // namespace chrome | 591 } // namespace chrome |
| OLD | NEW |