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 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 StartupBrowserCreator::RegisterLocalStatePrefs(registry); | 359 StartupBrowserCreator::RegisterLocalStatePrefs(registry); |
360 // The native GCM is used on Android instead. | 360 // The native GCM is used on Android instead. |
361 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); | 361 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); |
362 UpgradeDetector::RegisterPrefs(registry); | 362 UpgradeDetector::RegisterPrefs(registry); |
363 #if !defined(OS_CHROMEOS) | 363 #if !defined(OS_CHROMEOS) |
364 RegisterDefaultBrowserPromptPrefs(registry); | 364 RegisterDefaultBrowserPromptPrefs(registry); |
365 #endif // !defined(OS_CHROMEOS) | 365 #endif // !defined(OS_CHROMEOS) |
366 #endif // !defined(OS_ANDROID) | 366 #endif // !defined(OS_ANDROID) |
367 | 367 |
368 #if defined(OS_CHROMEOS) | 368 #if defined(OS_CHROMEOS) |
| 369 arc::ArcAuthService::RegisterPrefs(registry); |
369 ChromeOSMetricsProvider::RegisterPrefs(registry); | 370 ChromeOSMetricsProvider::RegisterPrefs(registry); |
370 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); | 371 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); |
371 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); | 372 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); |
372 chromeos::DataPromoNotification::RegisterPrefs(registry); | 373 chromeos::DataPromoNotification::RegisterPrefs(registry); |
373 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); | 374 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); |
374 chromeos::device_settings_cache::RegisterPrefs(registry); | 375 chromeos::device_settings_cache::RegisterPrefs(registry); |
375 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry); | 376 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry); |
376 chromeos::language_prefs::RegisterPrefs(registry); | 377 chromeos::language_prefs::RegisterPrefs(registry); |
377 chromeos::KioskAppManager::RegisterPrefs(registry); | 378 chromeos::KioskAppManager::RegisterPrefs(registry); |
378 chromeos::MultiProfileUserController::RegisterPrefs(registry); | 379 chromeos::MultiProfileUserController::RegisterPrefs(registry); |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
707 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, | 708 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, |
708 install_time.ToInternalValue()); | 709 install_time.ToInternalValue()); |
709 } | 710 } |
710 profile_prefs->ClearPref(kCheckDefaultBrowser); | 711 profile_prefs->ClearPref(kCheckDefaultBrowser); |
711 | 712 |
712 // Added 5/2016. | 713 // Added 5/2016. |
713 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); | 714 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); |
714 } | 715 } |
715 | 716 |
716 } // namespace chrome | 717 } // namespace chrome |
OLD | NEW |