Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(644)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2532103002: Add support for components/ntp_tiles in InstantService (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "components/flags_ui/pref_service_flags_storage.h" 76 #include "components/flags_ui/pref_service_flags_storage.h"
77 #include "components/gcm_driver/gcm_channel_status_syncer.h" 77 #include "components/gcm_driver/gcm_channel_status_syncer.h"
78 #include "components/metrics/metrics_service.h" 78 #include "components/metrics/metrics_service.h"
79 #include "components/network_time/network_time_tracker.h" 79 #include "components/network_time/network_time_tracker.h"
80 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h" 80 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h"
81 #include "components/ntp_snippets/content_suggestions_service.h" 81 #include "components/ntp_snippets/content_suggestions_service.h"
82 #include "components/ntp_snippets/remote/remote_suggestions_provider.h" 82 #include "components/ntp_snippets/remote/remote_suggestions_provider.h"
83 #include "components/ntp_snippets/remote/request_throttler.h" 83 #include "components/ntp_snippets/remote/request_throttler.h"
84 #include "components/ntp_snippets/sessions/foreign_sessions_suggestions_provider .h" 84 #include "components/ntp_snippets/sessions/foreign_sessions_suggestions_provider .h"
85 #include "components/ntp_snippets/user_classifier.h" 85 #include "components/ntp_snippets/user_classifier.h"
86 #include "components/ntp_tiles/most_visited_sites.h"
86 #include "components/omnibox/browser/zero_suggest_provider.h" 87 #include "components/omnibox/browser/zero_suggest_provider.h"
87 #include "components/password_manager/core/browser/password_bubble_experiment.h" 88 #include "components/password_manager/core/browser/password_bubble_experiment.h"
88 #include "components/password_manager/core/browser/password_manager.h" 89 #include "components/password_manager/core/browser/password_manager.h"
89 #include "components/policy/core/browser/browser_policy_connector.h" 90 #include "components/policy/core/browser/browser_policy_connector.h"
90 #include "components/policy/core/browser/url_blacklist_manager.h" 91 #include "components/policy/core/browser/url_blacklist_manager.h"
91 #include "components/policy/core/common/policy_statistics_collector.h" 92 #include "components/policy/core/common/policy_statistics_collector.h"
92 #include "components/pref_registry/pref_registry_syncable.h" 93 #include "components/pref_registry/pref_registry_syncable.h"
93 #include "components/prefs/pref_registry_simple.h" 94 #include "components/prefs/pref_registry_simple.h"
94 #include "components/prefs/pref_service.h" 95 #include "components/prefs/pref_service.h"
95 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" 96 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" 149 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
149 #endif 150 #endif
150 151
151 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 152 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
152 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" 153 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
153 #endif 154 #endif
154 155
155 #if BUILDFLAG(ANDROID_JAVA_UI) 156 #if BUILDFLAG(ANDROID_JAVA_UI)
156 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 157 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
157 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" 158 #include "chrome/browser/android/ntp/new_tab_page_prefs.h"
158 #include "components/ntp_tiles/most_visited_sites.h"
159 #include "components/ntp_tiles/popular_sites.h" 159 #include "components/ntp_tiles/popular_sites.h"
160 #else 160 #else
161 #include "chrome/browser/ui/startup/startup_browser_creator.h" 161 #include "chrome/browser/ui/startup/startup_browser_creator.h"
162 #include "chrome/browser/upgrade_detector.h" 162 #include "chrome/browser/upgrade_detector.h"
163 #endif 163 #endif
164 164
165 #if defined(OS_ANDROID) 165 #if defined(OS_ANDROID)
166 #include "chrome/browser/android/preferences/browser_prefs_android.h" 166 #include "chrome/browser/android/preferences/browser_prefs_android.h"
167 #else 167 #else
168 #include "chrome/browser/services/gcm/gcm_product_util.h" 168 #include "chrome/browser/services/gcm/gcm_product_util.h"
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 489 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
490 MediaDeviceIDSalt::RegisterProfilePrefs(registry); 490 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
491 MediaStreamDevicesController::RegisterProfilePrefs(registry); 491 MediaStreamDevicesController::RegisterProfilePrefs(registry);
492 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry); 492 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry);
493 ntp_snippets::ForeignSessionsSuggestionsProvider::RegisterProfilePrefs( 493 ntp_snippets::ForeignSessionsSuggestionsProvider::RegisterProfilePrefs(
494 registry); 494 registry);
495 ntp_snippets::RemoteSuggestionsProvider::RegisterProfilePrefs(registry); 495 ntp_snippets::RemoteSuggestionsProvider::RegisterProfilePrefs(registry);
496 ntp_snippets::ContentSuggestionsService::RegisterProfilePrefs(registry); 496 ntp_snippets::ContentSuggestionsService::RegisterProfilePrefs(registry);
497 ntp_snippets::RequestThrottler::RegisterProfilePrefs(registry); 497 ntp_snippets::RequestThrottler::RegisterProfilePrefs(registry);
498 ntp_snippets::UserClassifier::RegisterProfilePrefs(registry); 498 ntp_snippets::UserClassifier::RegisterProfilePrefs(registry);
499 ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry);
499 password_bubble_experiment::RegisterPrefs(registry); 500 password_bubble_experiment::RegisterPrefs(registry);
500 password_manager::PasswordManager::RegisterProfilePrefs(registry); 501 password_manager::PasswordManager::RegisterProfilePrefs(registry);
501 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); 502 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
502 PrefsTabHelper::RegisterProfilePrefs(registry); 503 PrefsTabHelper::RegisterProfilePrefs(registry);
503 Profile::RegisterProfilePrefs(registry); 504 Profile::RegisterProfilePrefs(registry);
504 ProfileImpl::RegisterProfilePrefs(registry); 505 ProfileImpl::RegisterProfilePrefs(registry);
505 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); 506 ProtocolHandlerRegistry::RegisterProfilePrefs(registry);
506 PushMessagingAppIdentifier::RegisterProfilePrefs(registry); 507 PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
507 RegisterBrowserUserPrefs(registry); 508 RegisterBrowserUserPrefs(registry);
508 SessionStartupPref::RegisterProfilePrefs(registry); 509 SessionStartupPref::RegisterProfilePrefs(registry);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); 557 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry);
557 SupervisedUserSyncService::RegisterProfilePrefs(registry); 558 SupervisedUserSyncService::RegisterProfilePrefs(registry);
558 #endif 559 #endif
559 ChildAccountService::RegisterProfilePrefs(registry); 560 ChildAccountService::RegisterProfilePrefs(registry);
560 SupervisedUserService::RegisterProfilePrefs(registry); 561 SupervisedUserService::RegisterProfilePrefs(registry);
561 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); 562 SupervisedUserWhitelistService::RegisterProfilePrefs(registry);
562 #endif 563 #endif
563 564
564 #if BUILDFLAG(ANDROID_JAVA_UI) 565 #if BUILDFLAG(ANDROID_JAVA_UI)
565 variations::VariationsService::RegisterProfilePrefs(registry); 566 variations::VariationsService::RegisterProfilePrefs(registry);
566 ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry);
567 ntp_tiles::PopularSites::RegisterProfilePrefs(registry); 567 ntp_tiles::PopularSites::RegisterProfilePrefs(registry);
568 NewTabPagePrefs::RegisterProfilePrefs(registry); 568 NewTabPagePrefs::RegisterProfilePrefs(registry);
569 PartnerBookmarksShim::RegisterProfilePrefs(registry); 569 PartnerBookmarksShim::RegisterProfilePrefs(registry);
570 #else 570 #else
571 AppShortcutManager::RegisterProfilePrefs(registry); 571 AppShortcutManager::RegisterProfilePrefs(registry);
572 DeviceIDFetcher::RegisterProfilePrefs(registry); 572 DeviceIDFetcher::RegisterProfilePrefs(registry);
573 DevToolsWindow::RegisterProfilePrefs(registry); 573 DevToolsWindow::RegisterProfilePrefs(registry);
574 #if BUILDFLAG(ENABLE_APP_LIST) 574 #if BUILDFLAG(ENABLE_APP_LIST)
575 DriveAppMapping::RegisterProfilePrefs(registry); 575 DriveAppMapping::RegisterProfilePrefs(registry);
576 app_list::AppListSyncableService::RegisterProfilePrefs(registry); 576 app_list::AppListSyncableService::RegisterProfilePrefs(registry);
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 // Added 8/2016. 783 // Added 8/2016.
784 profile_prefs->ClearPref(kStaticEncodings); 784 profile_prefs->ClearPref(kStaticEncodings);
785 profile_prefs->ClearPref(kRecentlySelectedEncoding); 785 profile_prefs->ClearPref(kRecentlySelectedEncoding);
786 786
787 // Added 9/2016. 787 // Added 9/2016.
788 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 788 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
789 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 789 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
790 } 790 }
791 791
792 } // namespace chrome 792 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698