chrome/browser/prefs/browser_prefs.cc - Issue 10392007: Restoring the chrome variatioons client, with a fix for browser_test failures caused by it.

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 10392007: Restoring the chrome variatioons client, with a fix for browser_test failures caused by it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: moved comment Created 8 years, 7 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 d0c2361bd207f045b66a3709a9515b6e610f6c0b..413e1cf31bf7f6db0764d48c2876e5abfcc51361 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -29,6 +29,7 @@

#include "chrome/browser/managed_mode.h"

#include "chrome/browser/metrics/metrics_log.h"

#include "chrome/browser/metrics/metrics_service.h"

+#include "chrome/browser/metrics/variations_service.h"

#include "chrome/browser/net/http_server_properties_manager.h"

#include "chrome/browser/net/net_pref_observer.h"

#include "chrome/browser/net/predictor.h"

@@ -121,6 +122,7 @@ void RegisterLocalState(PrefService* local_state) {

ProfileInfoCache::RegisterPrefs(local_state);

ProfileManager::RegisterPrefs(local_state);

SSLConfigServiceManager::RegisterPrefs(local_state);

+ VariationsService::RegisterPrefs(local_state);

WebCacheManager::RegisterPrefs(local_state);

#if defined(ENABLE_CONFIGURATION_POLICY)

« no previous file with comments | « chrome/browser/metrics/variations_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »