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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2047683002: Store Origin Trials public key in browser prefs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 9fa140ae915edd6ba90aecc7b22879ea05e94eb6..7418a5871883d2986bdad1c38c62731dfd60fb20 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -40,6 +40,7 @@
#include "chrome/browser/plugins/plugin_finder.h"
#include "chrome/browser/prefs/chrome_pref_service_factory.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
+#include "chrome/browser/prefs/origin_trial_prefs.h"
#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/profiles/chrome_version_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -311,6 +312,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
IntranetRedirectDetector::RegisterPrefs(registry);
IOThread::RegisterPrefs(registry);
network_time::NetworkTimeTracker::RegisterPrefs(registry);
+ RegisterOriginTrialPrefs(registry);
chasej 2016/06/07 15:09:40 All other registration methods seemed to be contai
iclelland 2016/06/08 02:48:22 Done.
PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
ProfileInfoCache::RegisterPrefs(registry);
profiles::RegisterPrefs(registry);

Powered by Google App Engine
This is Rietveld 408576698