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

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

Issue 2349073002: Blimp Settings framework on the c++ side (Closed)
Patch Set: nits and sync to head Created 4 years, 1 month 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/bookmarks/partner_bookmarks_shim.h" 152 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
153 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" 153 #include "chrome/browser/android/ntp/new_tab_page_prefs.h"
154 #include "components/ntp_tiles/most_visited_sites.h" 154 #include "components/ntp_tiles/most_visited_sites.h"
155 #include "components/ntp_tiles/popular_sites.h" 155 #include "components/ntp_tiles/popular_sites.h"
156 #else 156 #else
157 #include "chrome/browser/ui/startup/startup_browser_creator.h" 157 #include "chrome/browser/ui/startup/startup_browser_creator.h"
158 #include "chrome/browser/upgrade_detector.h" 158 #include "chrome/browser/upgrade_detector.h"
159 #endif 159 #endif
160 160
161 #if defined(OS_ANDROID) 161 #if defined(OS_ANDROID)
162 #include "chrome/browser/notifications/notification_platform_bridge_android.h" 162 #include "chrome/browser/android/preferences/browser_prefs_android.h"
163 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h"
164 #else 163 #else
165 #include "chrome/browser/services/gcm/gcm_product_util.h" 164 #include "chrome/browser/services/gcm/gcm_product_util.h"
166 #include "chrome/browser/signin/signin_promo.h" 165 #include "chrome/browser/signin/signin_promo.h"
167 #include "chrome/browser/ui/webui/foreign_session_handler.h" 166 #include "chrome/browser/ui/webui/foreign_session_handler.h"
168 #endif 167 #endif
169 168
170 #if defined(OS_CHROMEOS) 169 #if defined(OS_CHROMEOS)
171 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 170 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
172 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 171 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
173 #include "chrome/browser/chromeos/customization/customization_document.h" 172 #include "chrome/browser/chromeos/customization/customization_document.h"
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 extensions::CommandService::RegisterProfilePrefs(registry); 570 extensions::CommandService::RegisterProfilePrefs(registry);
572 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 571 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
573 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 572 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
574 first_run::RegisterProfilePrefs(registry); 573 first_run::RegisterProfilePrefs(registry);
575 NewTabUI::RegisterProfilePrefs(registry); 574 NewTabUI::RegisterProfilePrefs(registry);
576 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 575 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
577 PinnedTabCodec::RegisterProfilePrefs(registry); 576 PinnedTabCodec::RegisterProfilePrefs(registry);
578 signin::RegisterProfilePrefs(registry); 577 signin::RegisterProfilePrefs(registry);
579 #endif 578 #endif
580 579
581 #if defined(OS_ANDROID) 580 #if !defined(OS_ANDROID)
582 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry);
583 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry);
584 #else
585 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); 581 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
586 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); 582 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
587 gcm::RegisterProfilePrefs(registry); 583 gcm::RegisterProfilePrefs(registry);
588 #endif 584 #endif
589 585
590 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 586 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
591 default_apps::RegisterProfilePrefs(registry); 587 default_apps::RegisterProfilePrefs(registry);
592 #endif 588 #endif
593 589
594 #if defined(OS_CHROMEOS) 590 #if defined(OS_CHROMEOS)
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 670
675 registry->RegisterBooleanPref(kWebKitAllowDisplayingInsecureContent, true); 671 registry->RegisterBooleanPref(kWebKitAllowDisplayingInsecureContent, true);
676 } 672 }
677 673
678 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 674 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
679 RegisterProfilePrefs(registry); 675 RegisterProfilePrefs(registry);
680 676
681 #if defined(OS_CHROMEOS) 677 #if defined(OS_CHROMEOS)
682 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); 678 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry);
683 #endif 679 #endif
680
681 #if defined(OS_ANDROID)
682 ::android::RegisterUserProfilePrefs(registry);
683 #endif
684 } 684 }
685 685
686 void RegisterScreenshotPrefs(PrefRegistrySimple* registry) { 686 void RegisterScreenshotPrefs(PrefRegistrySimple* registry) {
687 registry->RegisterBooleanPref(prefs::kDisableScreenshots, false); 687 registry->RegisterBooleanPref(prefs::kDisableScreenshots, false);
688 } 688 }
689 689
690 #if defined(OS_CHROMEOS) 690 #if defined(OS_CHROMEOS)
691 void RegisterLoginProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 691 void RegisterLoginProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
692 RegisterProfilePrefs(registry); 692 RegisterProfilePrefs(registry);
693 693
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 // Added 8/2016. 775 // Added 8/2016.
776 profile_prefs->ClearPref(kStaticEncodings); 776 profile_prefs->ClearPref(kStaticEncodings);
777 profile_prefs->ClearPref(kRecentlySelectedEncoding); 777 profile_prefs->ClearPref(kRecentlySelectedEncoding);
778 778
779 // Added 9/2016. 779 // Added 9/2016.
780 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 780 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
781 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 781 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
782 } 782 }
783 783
784 } // namespace chrome 784 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698