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

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

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

Powered by Google App Engine
This is Rietveld 408576698