| 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 #endif | 217 #endif |
| 218 | 218 |
| 219 #if defined(USE_ASH) | 219 #if defined(USE_ASH) |
| 220 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 220 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
| 221 #endif | 221 #endif |
| 222 | 222 |
| 223 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 223 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 224 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 224 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 225 #endif | 225 #endif |
| 226 | 226 |
| 227 #if defined(ENABLE_ARC) |
| 228 #include "chrome/browser/ui/app_list/arc_app_list_prefs.h" |
| 229 #endif |
| 230 |
| 227 namespace { | 231 namespace { |
| 228 | 232 |
| 229 #if defined(OS_WIN) | 233 #if defined(OS_WIN) |
| 230 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+. | 234 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+. |
| 231 const char kShownAutoLaunchInfobarDeprecated[] = | 235 const char kShownAutoLaunchInfobarDeprecated[] = |
| 232 "browser.shown_autolaunch_infobar"; | 236 "browser.shown_autolaunch_infobar"; |
| 233 #endif // defined(OS_WIN) | 237 #endif // defined(OS_WIN) |
| 234 | 238 |
| 235 } // namespace | 239 } // namespace |
| 236 | 240 |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 chromeos::Preferences::RegisterProfilePrefs(registry); | 490 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 487 chromeos::proxy_config::RegisterProfilePrefs(registry); | 491 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| 488 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 492 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
| 489 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 493 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
| 490 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 494 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
| 491 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 495 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
| 492 RegisterProfilePrefs(registry); | 496 RegisterProfilePrefs(registry); |
| 493 FlagsUI::RegisterProfilePrefs(registry); | 497 FlagsUI::RegisterProfilePrefs(registry); |
| 494 #endif | 498 #endif |
| 495 | 499 |
| 500 #if defined(ENABLE_ARC) |
| 501 ArcAppListPrefs::RegisterProfilePrefs(registry); |
| 502 #endif |
| 503 |
| 496 #if defined(OS_WIN) | 504 #if defined(OS_WIN) |
| 497 component_updater::RegisterProfilePrefsForSwReporter(registry); | 505 component_updater::RegisterProfilePrefsForSwReporter(registry); |
| 498 NetworkProfileBubble::RegisterProfilePrefs(registry); | 506 NetworkProfileBubble::RegisterProfilePrefs(registry); |
| 499 #endif | 507 #endif |
| 500 | 508 |
| 501 #if defined(TOOLKIT_VIEWS) | 509 #if defined(TOOLKIT_VIEWS) |
| 502 RegisterBrowserViewProfilePrefs(registry); | 510 RegisterBrowserViewProfilePrefs(registry); |
| 503 RegisterInvertBubbleUserPrefs(registry); | 511 RegisterInvertBubbleUserPrefs(registry); |
| 504 #endif | 512 #endif |
| 505 | 513 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 MigrateGoogleNowPrefs(profile); | 568 MigrateGoogleNowPrefs(profile); |
| 561 #endif | 569 #endif |
| 562 | 570 |
| 563 #if defined(OS_WIN) | 571 #if defined(OS_WIN) |
| 564 // Added 11/2015. | 572 // Added 11/2015. |
| 565 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); | 573 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); |
| 566 #endif | 574 #endif |
| 567 } | 575 } |
| 568 | 576 |
| 569 } // namespace chrome | 577 } // namespace chrome |
| OLD | NEW |