| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 #if defined(ENABLE_SERVICE_DISCOVERY) | 142 #if defined(ENABLE_SERVICE_DISCOVERY) |
| 143 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 143 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
| 144 #endif | 144 #endif |
| 145 | 145 |
| 146 #if defined(OS_ANDROID) | 146 #if defined(OS_ANDROID) |
| 147 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 147 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
| 148 #include "chrome/browser/android/new_tab_page_prefs.h" | 148 #include "chrome/browser/android/new_tab_page_prefs.h" |
| 149 #else | 149 #else |
| 150 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" | 150 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" |
| 151 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" | 151 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" |
| 152 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 152 #endif | 153 #endif |
| 153 | 154 |
| 154 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 155 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 155 #include "chrome/browser/signin/signin_promo.h" | 156 #include "chrome/browser/signin/signin_promo.h" |
| 156 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 157 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 157 #endif | 158 #endif |
| 158 | 159 |
| 159 #if defined(OS_CHROMEOS) | 160 #if defined(OS_CHROMEOS) |
| 160 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 161 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| 161 #include "chrome/browser/chromeos/customization/customization_document.h" | 162 #include "chrome/browser/chromeos/customization/customization_document.h" |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 #endif | 296 #endif |
| 296 | 297 |
| 297 #if defined(ENABLE_TASK_MANAGER) | 298 #if defined(ENABLE_TASK_MANAGER) |
| 298 TaskManager::RegisterPrefs(registry); | 299 TaskManager::RegisterPrefs(registry); |
| 299 #endif // defined(ENABLE_TASK_MANAGER) | 300 #endif // defined(ENABLE_TASK_MANAGER) |
| 300 | 301 |
| 301 #if !defined(OS_ANDROID) | 302 #if !defined(OS_ANDROID) |
| 302 AutomaticProfileResetterFactory::RegisterPrefs(registry); | 303 AutomaticProfileResetterFactory::RegisterPrefs(registry); |
| 303 BackgroundModeManager::RegisterPrefs(registry); | 304 BackgroundModeManager::RegisterPrefs(registry); |
| 304 RegisterBrowserPrefs(registry); | 305 RegisterBrowserPrefs(registry); |
| 306 StartupBrowserCreator::RegisterLocalStatePrefs(registry); |
| 305 // The native GCM is used on Android instead. | 307 // The native GCM is used on Android instead. |
| 306 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); | 308 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); |
| 307 #if !defined(OS_CHROMEOS) | 309 #if !defined(OS_CHROMEOS) |
| 308 RegisterDefaultBrowserPromptPrefs(registry); | 310 RegisterDefaultBrowserPromptPrefs(registry); |
| 309 #endif // !defined(OS_CHROMEOS) | 311 #endif // !defined(OS_CHROMEOS) |
| 310 #endif // !defined(OS_ANDROID) | 312 #endif // !defined(OS_ANDROID) |
| 311 | 313 |
| 312 #if defined(OS_CHROMEOS) | 314 #if defined(OS_CHROMEOS) |
| 313 ChromeOSMetricsProvider::RegisterPrefs(registry); | 315 ChromeOSMetricsProvider::RegisterPrefs(registry); |
| 314 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); | 316 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 632 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
| 631 | 633 |
| 632 // We're done migrating the profile per-host zoom level values, so we clear | 634 // We're done migrating the profile per-host zoom level values, so we clear |
| 633 // them all. | 635 // them all. |
| 634 DictionaryPrefUpdate host_zoom_dictionary_update( | 636 DictionaryPrefUpdate host_zoom_dictionary_update( |
| 635 prefs, prefs::kPerHostZoomLevelsDeprecated); | 637 prefs, prefs::kPerHostZoomLevelsDeprecated); |
| 636 host_zoom_dictionary_update->Clear(); | 638 host_zoom_dictionary_update->Clear(); |
| 637 } | 639 } |
| 638 | 640 |
| 639 } // namespace chrome | 641 } // namespace chrome |
| OLD | NEW |