Chromium Code Reviews| 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/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 150 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 150 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
| 151 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" | 151 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" |
| 152 #include "components/ntp_tiles/most_visited_sites.h" | 152 #include "components/ntp_tiles/most_visited_sites.h" |
| 153 #include "components/ntp_tiles/popular_sites.h" | 153 #include "components/ntp_tiles/popular_sites.h" |
| 154 #else | 154 #else |
| 155 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 155 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 156 #include "chrome/browser/upgrade_detector.h" | 156 #include "chrome/browser/upgrade_detector.h" |
| 157 #endif | 157 #endif |
| 158 | 158 |
| 159 #if defined(OS_ANDROID) | 159 #if defined(OS_ANDROID) |
| 160 #include "blimp/client/public/blimp_client_context.h" | |
| 160 #include "chrome/browser/notifications/notification_platform_bridge_android.h" | 161 #include "chrome/browser/notifications/notification_platform_bridge_android.h" |
| 161 #include "components/ntp_snippets/offline_pages/offline_page_suggestions_provide r.h" | 162 #include "components/ntp_snippets/offline_pages/offline_page_suggestions_provide r.h" |
| 162 #else | 163 #else |
| 163 #include "chrome/browser/services/gcm/gcm_product_util.h" | 164 #include "chrome/browser/services/gcm/gcm_product_util.h" |
| 164 #include "chrome/browser/signin/signin_promo.h" | 165 #include "chrome/browser/signin/signin_promo.h" |
| 165 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 166 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 166 #endif | 167 #endif |
| 167 | 168 |
| 168 #if defined(OS_CHROMEOS) | 169 #if defined(OS_CHROMEOS) |
| 169 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 170 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 391 StartupBrowserCreator::RegisterLocalStatePrefs(registry); | 392 StartupBrowserCreator::RegisterLocalStatePrefs(registry); |
| 392 // The native GCM is used on Android instead. | 393 // The native GCM is used on Android instead. |
| 393 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); | 394 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); |
| 394 gcm::RegisterPrefs(registry); | 395 gcm::RegisterPrefs(registry); |
| 395 UpgradeDetector::RegisterPrefs(registry); | 396 UpgradeDetector::RegisterPrefs(registry); |
| 396 #if !defined(OS_CHROMEOS) | 397 #if !defined(OS_CHROMEOS) |
| 397 RegisterDefaultBrowserPromptPrefs(registry); | 398 RegisterDefaultBrowserPromptPrefs(registry); |
| 398 #endif // !defined(OS_CHROMEOS) | 399 #endif // !defined(OS_CHROMEOS) |
| 399 #endif // !defined(OS_ANDROID) | 400 #endif // !defined(OS_ANDROID) |
| 400 | 401 |
| 402 #if defined(OS_ANDROID) | |
| 403 blimp::client::BlimpClientContext::RegisterPrefs(registry); | |
| 404 #endif | |
| 405 | |
|
Menglin
2016/09/30 23:48:57
in fact i'm adding this to the wrong place. I shou
David Trainor- moved to gerrit
2016/10/01 03:26:34
What's the difference between the two? I'm not qu
Menglin
2016/10/03 23:08:26
I asked tommy. I think conceptually local prefs ar
| |
| 401 #if defined(OS_CHROMEOS) | 406 #if defined(OS_CHROMEOS) |
| 402 ChromeOSMetricsProvider::RegisterPrefs(registry); | 407 ChromeOSMetricsProvider::RegisterPrefs(registry); |
| 403 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); | 408 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); |
| 404 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); | 409 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); |
| 405 chromeos::DataPromoNotification::RegisterPrefs(registry); | 410 chromeos::DataPromoNotification::RegisterPrefs(registry); |
| 406 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); | 411 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); |
| 407 chromeos::device_settings_cache::RegisterPrefs(registry); | 412 chromeos::device_settings_cache::RegisterPrefs(registry); |
| 408 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry); | 413 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry); |
| 409 chromeos::language_prefs::RegisterPrefs(registry); | 414 chromeos::language_prefs::RegisterPrefs(registry); |
| 410 chromeos::KioskAppManager::RegisterPrefs(registry); | 415 chromeos::KioskAppManager::RegisterPrefs(registry); |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 764 // Added 8/2016. | 769 // Added 8/2016. |
| 765 profile_prefs->ClearPref(kStaticEncodings); | 770 profile_prefs->ClearPref(kStaticEncodings); |
| 766 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 771 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 767 | 772 |
| 768 // Added 9/2016. | 773 // Added 9/2016. |
| 769 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 774 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 770 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 775 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 771 } | 776 } |
| 772 | 777 |
| 773 } // namespace chrome | 778 } // namespace chrome |
| OLD | NEW |