chrome/browser/chrome_browser_main.cc - Issue 11243002: Move the bits of Prefs where production code has only trivially easy

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/chrome_browser_main.cc

Issue 11243002: Move the bits of Prefs where production code has only trivially easy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, fix gypi problem Created 8 years, 2 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/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index d7d9bbc678c1e805a0d2776124a2e203fe30edf0..777fb896791a3446afa2335b6bd8893de9b2a285 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -17,6 +17,7 @@

#include "base/metrics/field_trial.h"

#include "base/metrics/histogram.h"

#include "base/path_service.h"

+#include "base/prefs/json_pref_store.h"

#include "base/process_info.h"

#include "base/process_util.h"

#include "base/run_loop.h"

@@ -89,7 +90,6 @@

#include "chrome/common/chrome_result_codes.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/env_vars.h"

-#include "chrome/common/json_pref_store.h"

#include "chrome/common/jstemplate_builder.h"

#include "chrome/common/logging_chrome.h"

#include "chrome/common/metrics/variations/variations_util.h"