Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

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

Issue 78763002: Move PolicyMap and its dependencies to components/policy/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: export nested struct Created 7 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/prefs/pref_service_syncable_factory.h" 5 #include "chrome/browser/prefs/pref_service_syncable_factory.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/prefs/default_pref_store.h" 8 #include "base/prefs/default_pref_store.h"
9 #include "base/prefs/pref_notifier_impl.h" 9 #include "base/prefs/pref_notifier_impl.h"
10 #include "base/prefs/pref_value_store.h" 10 #include "base/prefs/pref_value_store.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/prefs/command_line_pref_store.h" 12 #include "chrome/browser/prefs/command_line_pref_store.h"
13 #include "chrome/browser/prefs/pref_service_syncable.h" 13 #include "chrome/browser/prefs/pref_service_syncable.h"
14 #include "components/user_prefs/pref_registry_syncable.h" 14 #include "components/user_prefs/pref_registry_syncable.h"
15 15
16 #if defined(ENABLE_CONFIGURATION_POLICY) 16 #if defined(ENABLE_CONFIGURATION_POLICY)
17 #include "chrome/browser/policy/browser_policy_connector.h" 17 #include "chrome/browser/policy/browser_policy_connector.h"
18 #include "chrome/browser/policy/configuration_policy_pref_store.h" 18 #include "chrome/browser/policy/configuration_policy_pref_store.h"
19 #include "chrome/browser/policy/policy_service.h" 19 #include "chrome/browser/policy/policy_service.h"
20 #include "chrome/browser/policy/policy_types.h" 20 #include "components/policy/core/common/policy_types.h"
21 #endif 21 #endif
22 22
23 PrefServiceSyncableFactory::PrefServiceSyncableFactory() { 23 PrefServiceSyncableFactory::PrefServiceSyncableFactory() {
24 } 24 }
25 25
26 PrefServiceSyncableFactory::~PrefServiceSyncableFactory() { 26 PrefServiceSyncableFactory::~PrefServiceSyncableFactory() {
27 } 27 }
28 28
29 #if defined(ENABLE_CONFIGURATION_POLICY) 29 #if defined(ENABLE_CONFIGURATION_POLICY)
30 void PrefServiceSyncableFactory::SetManagedPolicies( 30 void PrefServiceSyncableFactory::SetManagedPolicies(
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 user_prefs_.get(), 64 user_prefs_.get(),
65 recommended_prefs_.get(), 65 recommended_prefs_.get(),
66 pref_registry->defaults().get(), 66 pref_registry->defaults().get(),
67 pref_notifier), 67 pref_notifier),
68 user_prefs_.get(), 68 user_prefs_.get(),
69 pref_registry, 69 pref_registry,
70 read_error_callback_, 70 read_error_callback_,
71 async_)); 71 async_));
72 return pref_service.Pass(); 72 return pref_service.Pass();
73 } 73 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698