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

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: Rebase; update SetupOriginTrials method name 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 5f554d96f43a67b5925f54fc5dc25e869222c70b..c820cbd1f9cb2cea2a07285d7e9c261b929c9bec 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -41,6 +41,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"
@@ -315,6 +316,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
IntranetRedirectDetector::RegisterPrefs(registry);
IOThread::RegisterPrefs(registry);
network_time::NetworkTimeTracker::RegisterPrefs(registry);
+ OriginTrialPrefs::RegisterPrefs(registry);
PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
ProfileInfoCache::RegisterPrefs(registry);
profiles::RegisterPrefs(registry);
« no previous file with comments | « chrome/browser/component_updater/origin_trials_component_installer.cc ('k') | chrome/browser/prefs/origin_trial_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698