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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
201 #include "chromeos/timezone/timezone_resolver.h" | 201 #include "chromeos/timezone/timezone_resolver.h" |
202 #include "components/invalidation/impl/invalidator_storage.h" | 202 #include "components/invalidation/impl/invalidator_storage.h" |
203 #include "components/quirks/quirks_manager.h" | 203 #include "components/quirks/quirks_manager.h" |
204 #else | 204 #else |
205 #include "chrome/browser/extensions/default_apps.h" | 205 #include "chrome/browser/extensions/default_apps.h" |
206 #endif | 206 #endif |
207 | 207 |
208 #if defined(OS_ANDROID) | 208 #if defined(OS_ANDROID) |
209 #include "chrome/browser/notifications/notification_platform_bridge_android.h" | 209 #include "chrome/browser/notifications/notification_platform_bridge_android.h" |
210 #include "components/ntp_snippets/offline_pages/offline_page_suggestions_provide r.h" | 210 #include "components/ntp_snippets/offline_pages/offline_page_suggestions_provide r.h" |
211 #include "components/ntp_snippets/sessions/foreign_sessions_suggestions_provider .h" | |
211 #endif | 212 #endif |
212 | 213 |
213 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) | 214 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
214 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" | 215 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" |
215 #endif | 216 #endif |
216 | 217 |
217 #if defined(OS_MACOSX) | 218 #if defined(OS_MACOSX) |
218 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 219 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
219 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 220 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
220 #endif | 221 #endif |
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
551 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 552 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
552 first_run::RegisterProfilePrefs(registry); | 553 first_run::RegisterProfilePrefs(registry); |
553 NewTabUI::RegisterProfilePrefs(registry); | 554 NewTabUI::RegisterProfilePrefs(registry); |
554 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 555 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
555 PinnedTabCodec::RegisterProfilePrefs(registry); | 556 PinnedTabCodec::RegisterProfilePrefs(registry); |
556 signin::RegisterProfilePrefs(registry); | 557 signin::RegisterProfilePrefs(registry); |
557 #endif | 558 #endif |
558 | 559 |
559 #if defined(OS_ANDROID) | 560 #if defined(OS_ANDROID) |
560 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry); | 561 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry); |
562 ntp_snippets::ForeignSessionsSuggestionsProvider::RegisterProfilePrefs( | |
563 registry); | |
Marc Treib
2016/08/29 09:18:50
Is any of this really Android-specific? If not, pl
skym
2016/09/15 23:18:16
Done.
| |
561 ntp_snippets::OfflinePageSuggestionsProvider::RegisterProfilePrefs(registry); | 564 ntp_snippets::OfflinePageSuggestionsProvider::RegisterProfilePrefs(registry); |
562 #else | 565 #else |
563 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 566 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
564 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 567 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
565 gcm::RegisterProfilePrefs(registry); | 568 gcm::RegisterProfilePrefs(registry); |
566 #endif | 569 #endif |
567 | 570 |
568 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 571 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
569 default_apps::RegisterProfilePrefs(registry); | 572 default_apps::RegisterProfilePrefs(registry); |
570 #endif | 573 #endif |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
738 // Added 5/2016. | 741 // Added 5/2016. |
739 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); | 742 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); |
740 | 743 |
741 // Added 7/2016. | 744 // Added 7/2016. |
742 DeleteWebRTCIdentityStoreDB(profile); | 745 DeleteWebRTCIdentityStoreDB(profile); |
743 profile_prefs->ClearPref(kNetworkPredictionEnabled); | 746 profile_prefs->ClearPref(kNetworkPredictionEnabled); |
744 profile_prefs->ClearPref(kDisableSpdy); | 747 profile_prefs->ClearPref(kDisableSpdy); |
745 } | 748 } |
746 | 749 |
747 } // namespace chrome | 750 } // namespace chrome |
OLD | NEW |