summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 13:44:54 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 13:44:54 +0000
commit8790770a10a0c67f15a7e1d49a3fcbb3ef4d7f3f (patch)
tree3acf6617ab6ac3d7a04fcbdf5d62da922c57e3cb /chrome/browser/prefs
parentc45ea217857a088a1f0acd2892bfea82319bd388 (diff)
downloadchromium_src-8790770a10a0c67f15a7e1d49a3fcbb3ef4d7f3f.zip
chromium_src-8790770a10a0c67f15a7e1d49a3fcbb3ef4d7f3f.tar.gz
chromium_src-8790770a10a0c67f15a7e1d49a3fcbb3ef4d7f3f.tar.bz2
Move policy-related stuff to its own namespace.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/3360019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/pref_notifier.cc3
-rw-r--r--chrome/browser/prefs/pref_value_store.cc1
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/prefs/pref_notifier.cc b/chrome/browser/prefs/pref_notifier.cc
index 665bffb..f779738 100644
--- a/chrome/browser/prefs/pref_notifier.cc
+++ b/chrome/browser/prefs/pref_notifier.cc
@@ -120,6 +120,8 @@ void PrefNotifier::FireObserversForRefreshedManagedPrefs(
void PrefNotifier::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
+ using policy::ConfigurationPolicyPrefStore;
+
if (type == NotificationType::POLICY_CHANGED) {
PrefValueStore::AfterRefreshCallback* callback =
NewCallback(this,
@@ -134,7 +136,6 @@ void PrefNotifier::Observe(NotificationType type,
&PrefValueStore::RefreshPolicyPrefs,
ConfigurationPolicyPrefStore::CreateManagedPolicyPrefStore(),
ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore(),
-
callback));
}
}
diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc
index 501f1e1..911d8b4 100644
--- a/chrome/browser/prefs/pref_value_store.cc
+++ b/chrome/browser/prefs/pref_value_store.cc
@@ -17,6 +17,7 @@ PrefValueStore* PrefValueStore::CreatePrefValueStore(
const FilePath& pref_filename,
Profile* profile,
bool user_only) {
+ using policy::ConfigurationPolicyPrefStore;
ConfigurationPolicyPrefStore* managed = NULL;
ExtensionPrefStore* extension = NULL;
CommandLinePrefStore* command_line = NULL;