chrome/browser/prefs/browser_prefs.cc - Issue 2047683002: Store Origin Trials public key in browser prefs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Addressing first round review comments 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:

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..cc8cd278100ec80d3fa0b373956cea1cd0300e0d 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);

+ OriginTrialPrefs::RegisterPrefs(registry);

PrefProxyConfigTrackerImpl::RegisterPrefs(registry);

ProfileInfoCache::RegisterPrefs(registry);

profiles::RegisterPrefs(registry);