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

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

Issue 2360263002: [NTPSnippets] Show all downloads on the NTP (3/3): Downloads provider. (Closed)
Patch Set: Marc's comments + tests + some corrections. Created 4 years, 2 months 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" 152 #include "chrome/browser/android/ntp/new_tab_page_prefs.h"
153 #include "components/ntp_tiles/most_visited_sites.h" 153 #include "components/ntp_tiles/most_visited_sites.h"
154 #include "components/ntp_tiles/popular_sites.h" 154 #include "components/ntp_tiles/popular_sites.h"
155 #else 155 #else
156 #include "chrome/browser/ui/startup/startup_browser_creator.h" 156 #include "chrome/browser/ui/startup/startup_browser_creator.h"
157 #include "chrome/browser/upgrade_detector.h" 157 #include "chrome/browser/upgrade_detector.h"
158 #endif 158 #endif
159 159
160 #if defined(OS_ANDROID) 160 #if defined(OS_ANDROID)
161 #include "chrome/browser/notifications/notification_platform_bridge_android.h" 161 #include "chrome/browser/notifications/notification_platform_bridge_android.h"
162 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h"
162 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h" 163 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h"
163 #else 164 #else
164 #include "chrome/browser/services/gcm/gcm_product_util.h" 165 #include "chrome/browser/services/gcm/gcm_product_util.h"
165 #include "chrome/browser/signin/signin_promo.h" 166 #include "chrome/browser/signin/signin_promo.h"
166 #include "chrome/browser/ui/webui/foreign_session_handler.h" 167 #include "chrome/browser/ui/webui/foreign_session_handler.h"
167 #endif 168 #endif
168 169
169 #if defined(OS_CHROMEOS) 170 #if defined(OS_CHROMEOS)
170 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 171 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
171 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 172 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 571 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
571 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 572 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
572 first_run::RegisterProfilePrefs(registry); 573 first_run::RegisterProfilePrefs(registry);
573 NewTabUI::RegisterProfilePrefs(registry); 574 NewTabUI::RegisterProfilePrefs(registry);
574 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 575 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
575 PinnedTabCodec::RegisterProfilePrefs(registry); 576 PinnedTabCodec::RegisterProfilePrefs(registry);
576 signin::RegisterProfilePrefs(registry); 577 signin::RegisterProfilePrefs(registry);
577 #endif 578 #endif
578 579
579 #if defined(OS_ANDROID) 580 #if defined(OS_ANDROID)
581 DownloadSuggestionsProvider::RegisterProfilePrefs(registry);
580 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry); 582 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry);
581 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry); 583 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry);
582 #else 584 #else
583 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); 585 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
584 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); 586 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
585 gcm::RegisterProfilePrefs(registry); 587 gcm::RegisterProfilePrefs(registry);
586 #endif 588 #endif
587 589
588 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 590 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
589 default_apps::RegisterProfilePrefs(registry); 591 default_apps::RegisterProfilePrefs(registry);
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 // Added 8/2016. 775 // Added 8/2016.
774 profile_prefs->ClearPref(kStaticEncodings); 776 profile_prefs->ClearPref(kStaticEncodings);
775 profile_prefs->ClearPref(kRecentlySelectedEncoding); 777 profile_prefs->ClearPref(kRecentlySelectedEncoding);
776 778
777 // Added 9/2016. 779 // Added 9/2016.
778 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 780 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
779 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 781 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
780 } 782 }
781 783
782 } // namespace chrome 784 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698