chrome/browser/prefs/pref_value_store.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/prefs/pref_value_store.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/prefs/pref_value_store.h ('k') | chrome/browser/prefs/pref_value_store_unittest.cc » ('j') | chrome/chrome_browser.gypi » ('J')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

7 #include "base/values.h"	7 #include "base/values.h"

8 #include "chrome/browser/chrome_thread.h"	8 #include "chrome/browser/chrome_thread.h"

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

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

11 #include "chrome/browser/extensions/extension_pref_store.h"	11 #include "chrome/browser/prefs/command_line_pref_store.h"

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

13 #include "chrome/common/notification_service.h"	13 #include "chrome/common/notification_service.h"

14	14

15 // static	15 // static

16 PrefValueStore* PrefValueStore::CreatePrefValueStore(	16 PrefValueStore* PrefValueStore::CreatePrefValueStore(

17 const FilePath& pref_filename,	17 const FilePath& pref_filename,

18 Profile* profile,	18 Profile* profile,

19 bool user_only) {	19 bool user_only) {

20 ConfigurationPolicyPrefStore* managed = NULL;	20 ConfigurationPolicyPrefStore* managed = NULL;

21 ExtensionPrefStore* extension = NULL;	21 ExtensionPrefStore* extension = NULL;

(...skipping 268 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
290 PrefStore* extension_prefs,	290 PrefStore* extension_prefs,

291 PrefStore* command_line_prefs,	291 PrefStore* command_line_prefs,

292 PrefStore* user_prefs,	292 PrefStore* user_prefs,

293 PrefStore* recommended_prefs) {	293 PrefStore* recommended_prefs) {

294 pref_stores_[PrefNotifier::MANAGED_STORE].reset(managed_prefs);	294 pref_stores_[PrefNotifier::MANAGED_STORE].reset(managed_prefs);

295 pref_stores_[PrefNotifier::EXTENSION_STORE].reset(extension_prefs);	295 pref_stores_[PrefNotifier::EXTENSION_STORE].reset(extension_prefs);

296 pref_stores_[PrefNotifier::COMMAND_LINE_STORE].reset(command_line_prefs);	296 pref_stores_[PrefNotifier::COMMAND_LINE_STORE].reset(command_line_prefs);

297 pref_stores_[PrefNotifier::USER_STORE].reset(user_prefs);	297 pref_stores_[PrefNotifier::USER_STORE].reset(user_prefs);

298 pref_stores_[PrefNotifier::RECOMMENDED_STORE].reset(recommended_prefs);	298 pref_stores_[PrefNotifier::RECOMMENDED_STORE].reset(recommended_prefs);

299 }	299 }

OLD	NEW