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

Side by Side Diff: chrome/browser/policy/policy_service_impl.h

Issue 99333002: Revert of Move ConfigurationPolicyProvider, etc. to components/policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_POLICY_POLICY_SERVICE_IMPL_H_ 5 #ifndef CHROME_BROWSER_POLICY_POLICY_SERVICE_IMPL_H_
6 #define CHROME_BROWSER_POLICY_POLICY_SERVICE_IMPL_H_ 6 #define CHROME_BROWSER_POLICY_POLICY_SERVICE_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "chrome/browser/policy/configuration_policy_provider.h"
17 #include "chrome/browser/policy/policy_service.h" 18 #include "chrome/browser/policy/policy_service.h"
18 #include "components/policy/core/common/configuration_policy_provider.h"
19 #include "components/policy/core/common/policy_bundle.h" 19 #include "components/policy/core/common/policy_bundle.h"
20 20
21 namespace policy { 21 namespace policy {
22 22
23 class PolicyMap; 23 class PolicyMap;
24 24
25 class PolicyServiceImpl : public PolicyService, 25 class PolicyServiceImpl : public PolicyService,
26 public ConfigurationPolicyProvider::Observer { 26 public ConfigurationPolicyProvider::Observer {
27 public: 27 public:
28 typedef std::vector<ConfigurationPolicyProvider*> Providers; 28 typedef std::vector<ConfigurationPolicyProvider*> Providers;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // Used to create tasks to delay new policy updates while we may be already 98 // Used to create tasks to delay new policy updates while we may be already
99 // processing previous policy updates. 99 // processing previous policy updates.
100 base::WeakPtrFactory<PolicyServiceImpl> update_task_ptr_factory_; 100 base::WeakPtrFactory<PolicyServiceImpl> update_task_ptr_factory_;
101 101
102 DISALLOW_COPY_AND_ASSIGN(PolicyServiceImpl); 102 DISALLOW_COPY_AND_ASSIGN(PolicyServiceImpl);
103 }; 103 };
104 104
105 } // namespace policy 105 } // namespace policy
106 106
107 #endif // CHROME_BROWSER_POLICY_POLICY_SERVICE_IMPL_H_ 107 #endif // CHROME_BROWSER_POLICY_POLICY_SERVICE_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_prefs_browsertest.cc ('k') | chrome/browser/policy/policy_service_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698