| 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/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 #endif | 152 #endif |
| 153 | 153 |
| 154 #if defined(OS_CHROMEOS) | 154 #if defined(OS_CHROMEOS) |
| 155 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 155 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| 156 #include "chrome/browser/chromeos/arc/arc_auth_service.h" | 156 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| 157 #include "chrome/browser/chromeos/customization/customization_document.h" | 157 #include "chrome/browser/chromeos/customization/customization_document.h" |
| 158 #include "chrome/browser/chromeos/display/display_preferences.h" | 158 #include "chrome/browser/chromeos/display/display_preferences.h" |
| 159 #include "chrome/browser/chromeos/extensions/echo_private_api.h" | 159 #include "chrome/browser/chromeos/extensions/echo_private_api.h" |
| 160 #include "chrome/browser/chromeos/file_system_provider/registry.h" | 160 #include "chrome/browser/chromeos/file_system_provider/registry.h" |
| 161 #include "chrome/browser/chromeos/first_run/first_run.h" | 161 #include "chrome/browser/chromeos/first_run/first_run.h" |
| 162 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" |
| 162 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" | 163 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" |
| 163 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 164 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 164 #include "chrome/browser/chromeos/login/startup_utils.h" | 165 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 165 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" | 166 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
| 166 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" | 167 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" |
| 167 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" | 168 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" |
| 168 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" | 169 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" |
| 169 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 170 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 170 #include "chrome/browser/chromeos/net/proxy_config_handler.h" | 171 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
| 171 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" | 172 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 521 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 521 default_apps::RegisterProfilePrefs(registry); | 522 default_apps::RegisterProfilePrefs(registry); |
| 522 #endif | 523 #endif |
| 523 | 524 |
| 524 #if defined(OS_CHROMEOS) | 525 #if defined(OS_CHROMEOS) |
| 525 arc::ArcAuthService::RegisterProfilePrefs(registry); | 526 arc::ArcAuthService::RegisterProfilePrefs(registry); |
| 526 chromeos::first_run::RegisterProfilePrefs(registry); | 527 chromeos::first_run::RegisterProfilePrefs(registry); |
| 527 chromeos::file_system_provider::RegisterProfilePrefs(registry); | 528 chromeos::file_system_provider::RegisterProfilePrefs(registry); |
| 528 chromeos::KeyPermissions::RegisterProfilePrefs(registry); | 529 chromeos::KeyPermissions::RegisterProfilePrefs(registry); |
| 529 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 530 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
| 531 chromeos::PinStorage::RegisterProfilePrefs(registry); |
| 530 chromeos::Preferences::RegisterProfilePrefs(registry); | 532 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 531 chromeos::proxy_config::RegisterProfilePrefs(registry); | 533 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| 532 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 534 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
| 533 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 535 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
| 534 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 536 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
| 535 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); | 537 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); |
| 536 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); | 538 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); |
| 537 #endif | 539 #endif |
| 538 | 540 |
| 539 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) | 541 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 681 metrics_service | 683 metrics_service |
| 682 ? base::Time::FromTimeT(metrics_service->GetInstallDate()) | 684 ? base::Time::FromTimeT(metrics_service->GetInstallDate()) |
| 683 : base::Time::Now(); | 685 : base::Time::Now(); |
| 684 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, | 686 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, |
| 685 install_time.ToInternalValue()); | 687 install_time.ToInternalValue()); |
| 686 } | 688 } |
| 687 profile_prefs->ClearPref(kCheckDefaultBrowser); | 689 profile_prefs->ClearPref(kCheckDefaultBrowser); |
| 688 } | 690 } |
| 689 | 691 |
| 690 } // namespace chrome | 692 } // namespace chrome |
| OLD | NEW |