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

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

Issue 2349073002: Blimp Settings framework on the c++ side (Closed)
Patch Set: move the PrefService logic from blimp_main.cc 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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 extensions::CommandService::RegisterProfilePrefs(registry); 569 extensions::CommandService::RegisterProfilePrefs(registry);
571 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 570 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
572 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 571 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
573 first_run::RegisterProfilePrefs(registry); 572 first_run::RegisterProfilePrefs(registry);
574 NewTabUI::RegisterProfilePrefs(registry); 573 NewTabUI::RegisterProfilePrefs(registry);
575 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 574 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
576 PinnedTabCodec::RegisterProfilePrefs(registry); 575 PinnedTabCodec::RegisterProfilePrefs(registry);
577 signin::RegisterProfilePrefs(registry); 576 signin::RegisterProfilePrefs(registry);
578 #endif 577 #endif
579 578
580 #if defined(OS_ANDROID) 579 #if !defined(OS_ANDROID)
581 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry);
582 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry);
583 #else
584 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); 580 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
585 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); 581 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
586 gcm::RegisterProfilePrefs(registry); 582 gcm::RegisterProfilePrefs(registry);
587 #endif 583 #endif
588 584
589 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 585 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
590 default_apps::RegisterProfilePrefs(registry); 586 default_apps::RegisterProfilePrefs(registry);
591 #endif 587 #endif
592 588
593 #if defined(OS_CHROMEOS) 589 #if defined(OS_CHROMEOS)
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 669
674 registry->RegisterBooleanPref(kWebKitAllowDisplayingInsecureContent, true); 670 registry->RegisterBooleanPref(kWebKitAllowDisplayingInsecureContent, true);
675 } 671 }
676 672
677 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 673 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
678 RegisterProfilePrefs(registry); 674 RegisterProfilePrefs(registry);
679 675
680 #if defined(OS_CHROMEOS) 676 #if defined(OS_CHROMEOS)
681 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); 677 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry);
682 #endif 678 #endif
679
680 #if defined(OS_ANDROID)
681 ::android::RegisterUserProfilePrefs(registry);
682 #endif
683 } 683 }
684 684
685 void RegisterScreenshotPrefs(PrefRegistrySimple* registry) { 685 void RegisterScreenshotPrefs(PrefRegistrySimple* registry) {
686 registry->RegisterBooleanPref(prefs::kDisableScreenshots, false); 686 registry->RegisterBooleanPref(prefs::kDisableScreenshots, false);
687 } 687 }
688 688
689 #if defined(OS_CHROMEOS) 689 #if defined(OS_CHROMEOS)
690 void RegisterLoginProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 690 void RegisterLoginProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
691 RegisterProfilePrefs(registry); 691 RegisterProfilePrefs(registry);
692 692
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 // Added 8/2016. 774 // Added 8/2016.
775 profile_prefs->ClearPref(kStaticEncodings); 775 profile_prefs->ClearPref(kStaticEncodings);
776 profile_prefs->ClearPref(kRecentlySelectedEncoding); 776 profile_prefs->ClearPref(kRecentlySelectedEncoding);
777 777
778 // Added 9/2016. 778 // Added 9/2016.
779 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 779 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
780 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 780 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
781 } 781 }
782 782
783 } // namespace chrome 783 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698