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/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 #include "chrome/browser/ui/browser_view_prefs.h" | 118 #include "chrome/browser/ui/browser_view_prefs.h" |
119 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" | 119 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" |
120 #endif | 120 #endif |
121 | 121 |
122 #if defined(TOOLKIT_GTK) | 122 #if defined(TOOLKIT_GTK) |
123 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 123 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
124 #endif | 124 #endif |
125 | 125 |
126 #if defined(OS_CHROMEOS) | 126 #if defined(OS_CHROMEOS) |
127 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 127 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| 128 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" |
128 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" | 129 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" |
129 #include "chrome/browser/chromeos/customization_document.h" | 130 #include "chrome/browser/chromeos/customization_document.h" |
130 #include "chrome/browser/chromeos/display/display_preferences.h" | 131 #include "chrome/browser/chromeos/display/display_preferences.h" |
131 #include "chrome/browser/chromeos/extensions/echo_private_api.h" | 132 #include "chrome/browser/chromeos/extensions/echo_private_api.h" |
132 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" | 133 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" |
133 #include "chrome/browser/chromeos/login/login_utils.h" | 134 #include "chrome/browser/chromeos/login/login_utils.h" |
134 #include "chrome/browser/chromeos/login/startup_utils.h" | 135 #include "chrome/browser/chromeos/login/startup_utils.h" |
135 #include "chrome/browser/chromeos/login/user_image_manager.h" | 136 #include "chrome/browser/chromeos/login/user_image_manager.h" |
136 #include "chrome/browser/chromeos/login/user_image_sync_observer.h" | 137 #include "chrome/browser/chromeos/login/user_image_sync_observer.h" |
137 #include "chrome/browser/chromeos/login/user_manager.h" | 138 #include "chrome/browser/chromeos/login/user_manager.h" |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 PluginsUI::RegisterProfilePrefs(registry); | 381 PluginsUI::RegisterProfilePrefs(registry); |
381 RegisterAutolaunchUserPrefs(registry); | 382 RegisterAutolaunchUserPrefs(registry); |
382 signin::RegisterProfilePrefs(registry); | 383 signin::RegisterProfilePrefs(registry); |
383 #endif | 384 #endif |
384 | 385 |
385 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 386 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
386 default_apps::RegisterProfilePrefs(registry); | 387 default_apps::RegisterProfilePrefs(registry); |
387 #endif | 388 #endif |
388 | 389 |
389 #if defined(OS_CHROMEOS) | 390 #if defined(OS_CHROMEOS) |
| 391 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs( |
| 392 registry); |
390 chromeos::Preferences::RegisterProfilePrefs(registry); | 393 chromeos::Preferences::RegisterProfilePrefs(registry); |
391 chromeos::proxy_config::RegisterProfilePrefs(registry); | 394 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| 395 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
392 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 396 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
393 RegisterProfilePrefs(registry); | 397 RegisterProfilePrefs(registry); |
394 FlagsUI::RegisterProfilePrefs(registry); | 398 FlagsUI::RegisterProfilePrefs(registry); |
395 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | |
396 #endif | 399 #endif |
397 | 400 |
398 #if defined(OS_WIN) | 401 #if defined(OS_WIN) |
399 NetworkProfileBubble::RegisterProfilePrefs(registry); | 402 NetworkProfileBubble::RegisterProfilePrefs(registry); |
400 #endif | 403 #endif |
401 | 404 |
402 #if defined(OS_MACOSX) | 405 #if defined(OS_MACOSX) |
403 RegisterBrowserActionsControllerProfilePrefs(registry); | 406 RegisterBrowserActionsControllerProfilePrefs(registry); |
404 #endif | 407 #endif |
405 | 408 |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
525 } | 528 } |
526 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 529 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
527 | 530 |
528 current_version |= GOOGLE_URL_TRACKER_PREFS; | 531 current_version |= GOOGLE_URL_TRACKER_PREFS; |
529 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 532 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
530 current_version); | 533 current_version); |
531 } | 534 } |
532 } | 535 } |
533 | 536 |
534 } // namespace chrome | 537 } // namespace chrome |
OLD | NEW |