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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
487 chromeos::Preferences::RegisterProfilePrefs(registry); | 488 chromeos::Preferences::RegisterProfilePrefs(registry); |
488 chromeos::proxy_config::RegisterProfilePrefs(registry); | 489 chromeos::proxy_config::RegisterProfilePrefs(registry); |
489 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 490 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
490 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 491 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
491 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 492 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
492 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 493 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
493 RegisterProfilePrefs(registry); | 494 RegisterProfilePrefs(registry); |
494 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); | 495 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); |
495 #endif | 496 #endif |
496 | 497 |
| 498 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
| 499 ArcAppListPrefs::RegisterProfilePrefs(registry); |
| 500 #endif |
| 501 |
497 #if defined(OS_WIN) | 502 #if defined(OS_WIN) |
498 component_updater::RegisterProfilePrefsForSwReporter(registry); | 503 component_updater::RegisterProfilePrefsForSwReporter(registry); |
499 NetworkProfileBubble::RegisterProfilePrefs(registry); | 504 NetworkProfileBubble::RegisterProfilePrefs(registry); |
500 #endif | 505 #endif |
501 | 506 |
502 #if defined(TOOLKIT_VIEWS) | 507 #if defined(TOOLKIT_VIEWS) |
503 RegisterBrowserViewProfilePrefs(registry); | 508 RegisterBrowserViewProfilePrefs(registry); |
504 RegisterInvertBubbleUserPrefs(registry); | 509 RegisterInvertBubbleUserPrefs(registry); |
505 #endif | 510 #endif |
506 | 511 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 MigrateGoogleNowPrefs(profile); | 566 MigrateGoogleNowPrefs(profile); |
562 #endif | 567 #endif |
563 | 568 |
564 #if defined(OS_WIN) | 569 #if defined(OS_WIN) |
565 // Added 11/2015. | 570 // Added 11/2015. |
566 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); | 571 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); |
567 #endif | 572 #endif |
568 } | 573 } |
569 | 574 |
570 } // namespace chrome | 575 } // namespace chrome |
OLD | NEW |