chrome/browser/prefs/pref_service.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/prefs/pref_service.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/prefs/pref_service.cc

diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc

index 10d7078989cfa4f7af59f96d16424134a12e45fb..a201e200a33c50758b4b7de079b50b2d6b331d4b 100644

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

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

@@ -13,6 +13,9 @@

#include "base/logging.h"

#include "base/message_loop.h"

#include "base/metrics/histogram.h"

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

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

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

#include "base/stl_util.h"

#include "base/string_number_conversions.h"

#include "base/string_util.h"

@@ -22,15 +25,12 @@

#include "chrome/browser/extensions/extension_pref_store.h"

#include "chrome/browser/policy/configuration_policy_pref_store.h"

#include "chrome/browser/prefs/command_line_pref_store.h"

-#include "chrome/browser/prefs/default_pref_store.h"

-#include "chrome/browser/prefs/overlay_user_pref_store.h"

#include "chrome/browser/prefs/pref_model_associator.h"

#include "chrome/browser/prefs/pref_notifier_impl.h"

#include "chrome/browser/prefs/pref_value_store.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/prefs/prefs_tab_helper.h"

#include "chrome/browser/ui/profile_error_dialog.h"

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

#include "chrome/common/pref_names.h"

#include "content/public/browser/browser_thread.h"

#include "grit/chromium_strings.h"