Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 2c610e19ec17d86c1f589e2d918a4922306e283e..e771ff41275ae0d2736fc4bc86eb8e7ff6166a27 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2010 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -661,10 +661,11 @@ net::TransportSecurityState* |
PrefService* ProfileImpl::GetPrefs() { |
if (!prefs_.get()) { |
- ExtensionPrefStore* extension_pref_store = new ExtensionPrefStore; |
- prefs_.reset(PrefService::CreatePrefService(GetPrefFilePath(), |
- extension_pref_store, |
- GetOriginalProfile())); |
+ extension_pref_value_map_.reset(new ExtensionPrefValueMap); |
+ prefs_.reset(PrefService::CreatePrefService( |
+ GetPrefFilePath(), |
+ new ExtensionPrefStore(extension_pref_value_map_.get(), false), |
+ GetOriginalProfile())); |
// The Profile class and ProfileManager class may read some prefs so |
// register known prefs as soon as possible. |
@@ -682,10 +683,11 @@ PrefService* ProfileImpl::GetPrefs() { |
// Ensure that preferences set by extensions are restored in the profile |
// as early as possible. The constructor takes care of that. |
+ |
Mattias Nissler (ping if slow)
2011/01/07 10:12:58
Why this newline?
battre
2011/01/10 16:55:47
Done.
|
extension_prefs_.reset(new ExtensionPrefs( |
prefs_.get(), |
GetPath().AppendASCII(ExtensionService::kInstallDirectoryName), |
- extension_pref_store)); |
+ extension_pref_value_map_.get())); |
DCHECK(!net_pref_observer_.get()); |
net_pref_observer_.reset(new NetPrefObserver(prefs_.get())); |