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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
8 #include "base/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "chrome/browser/about_flags.h" | 10 #include "chrome/browser/about_flags.h" |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 125 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
126 #include "chrome/browser/chromeos/login/wizard_controller.h" | 126 #include "chrome/browser/chromeos/login/wizard_controller.h" |
127 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" | 127 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
128 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 128 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
129 #include "chrome/browser/chromeos/policy/device_status_collector.h" | 129 #include "chrome/browser/chromeos/policy/device_status_collector.h" |
130 #include "chrome/browser/chromeos/preferences.h" | 130 #include "chrome/browser/chromeos/preferences.h" |
131 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 131 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
132 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 132 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
133 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 133 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
134 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" | 134 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" |
| 135 #include "chrome/browser/extensions/api/enterprise_enterprise_key_private/enterp
rise_enterprise_key_private_api.h" |
135 #else | 136 #else |
136 #include "chrome/browser/extensions/default_apps.h" | 137 #include "chrome/browser/extensions/default_apps.h" |
137 #endif | 138 #endif |
138 | 139 |
139 #if defined(USE_ASH) | 140 #if defined(USE_ASH) |
140 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 141 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
141 #endif | 142 #endif |
142 | 143 |
143 #if !defined(OS_ANDROID) | 144 #if !defined(OS_ANDROID) |
144 #include "chrome/browser/chrome_to_mobile_service.h" | 145 #include "chrome/browser/chrome_to_mobile_service.h" |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
344 #endif | 345 #endif |
345 | 346 |
346 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 347 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
347 default_apps::RegisterUserPrefs(registry); | 348 default_apps::RegisterUserPrefs(registry); |
348 #endif | 349 #endif |
349 | 350 |
350 #if defined(OS_CHROMEOS) | 351 #if defined(OS_CHROMEOS) |
351 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry); | 352 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry); |
352 chromeos::Preferences::RegisterUserPrefs(registry); | 353 chromeos::Preferences::RegisterUserPrefs(registry); |
353 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry); | 354 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry); |
| 355 extensions::EnterpriseEnterpriseKeyPrivateChallengeUserKeyFunction:: |
| 356 RegisterUserPrefs(registry); |
354 FlagsUI::RegisterUserPrefs(registry); | 357 FlagsUI::RegisterUserPrefs(registry); |
355 #endif | 358 #endif |
356 | 359 |
357 #if defined(OS_WIN) | 360 #if defined(OS_WIN) |
358 NetworkProfileBubble::RegisterUserPrefs(registry); | 361 NetworkProfileBubble::RegisterUserPrefs(registry); |
359 #endif | 362 #endif |
360 | 363 |
361 // Prefs registered only for migration (clearing or moving to a new | 364 // Prefs registered only for migration (clearing or moving to a new |
362 // key) go here. | 365 // key) go here. |
363 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(), | 366 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(), |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
439 } | 442 } |
440 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 443 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
441 | 444 |
442 current_version |= GOOGLE_URL_TRACKER_PREFS; | 445 current_version |= GOOGLE_URL_TRACKER_PREFS; |
443 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 446 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
444 current_version); | 447 current_version); |
445 } | 448 } |
446 } | 449 } |
447 | 450 |
448 } // namespace chrome | 451 } // namespace chrome |
OLD | NEW |