summaryrefslogtreecommitdiffstats
path: root/chrome/browser/pref_service.cc
diff options
context:
space:
mode:
authordanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-12 15:03:32 +0000
committerdanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-12 15:03:32 +0000
commitc0858b00d9c2009c489ee8d90eb46460a8acc82d (patch)
tree4816a658e5200edc5c2d8b5fb465b8a8474a3b58 /chrome/browser/pref_service.cc
parentd661e6ed98b7139f898f7edd33f7d1e2b946c9c6 (diff)
downloadchromium_src-c0858b00d9c2009c489ee8d90eb46460a8acc82d.zip
chromium_src-c0858b00d9c2009c489ee8d90eb46460a8acc82d.tar.gz
chromium_src-c0858b00d9c2009c489ee8d90eb46460a8acc82d.tar.bz2
Implementation of managed policy abstraction on top of a preference store. This is preparation work for implementing platform-specific policy.
BUG=none TEST=--gtest_filter=ConfigurationPolicyPrefStoreTest* Review URL: http://codereview.chromium.org/1692011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/pref_service.cc')
-rw-r--r--chrome/browser/pref_service.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/pref_service.cc b/chrome/browser/pref_service.cc
index 2a608fb..bfc3ceb 100644
--- a/chrome/browser/pref_service.cc
+++ b/chrome/browser/pref_service.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -128,7 +128,7 @@ PrefStore::PrefReadError PrefService::LoadPersistentPrefs() {
PrefStore::PrefReadError pref_error = store_->ReadPrefs();
- persistent_ = store_->Prefs();
+ persistent_ = store_->prefs();
for (PreferenceSet::iterator it = prefs_.begin();
it != prefs_.end(); ++it) {