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

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

Issue 60823003: Introduced a ForwardingPolicyProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_H_ 5 #ifndef CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_H_
6 #define CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_H_ 6 #define CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 // Profile's policy is the one that affects global policy settings in 79 // Profile's policy is the one that affects global policy settings in
80 // local state. 80 // local state.
81 bool is_primary_user_; 81 bool is_primary_user_;
82 82
83 scoped_ptr<ConfigurationPolicyProvider> special_user_policy_provider_; 83 scoped_ptr<ConfigurationPolicyProvider> special_user_policy_provider_;
84 84
85 base::WeakPtrFactory<ProfilePolicyConnector> weak_ptr_factory_; 85 base::WeakPtrFactory<ProfilePolicyConnector> weak_ptr_factory_;
86 #endif 86 #endif
87 87
88 Profile* profile_; 88 Profile* profile_;
89 scoped_ptr<ConfigurationPolicyProvider> forwarding_policy_provider_;
89 90
90 #endif // ENABLE_CONFIGURATION_POLICY 91 #endif // ENABLE_CONFIGURATION_POLICY
91 92
92 scoped_ptr<PolicyService> policy_service_; 93 scoped_ptr<PolicyService> policy_service_;
93 94
94 DISALLOW_COPY_AND_ASSIGN(ProfilePolicyConnector); 95 DISALLOW_COPY_AND_ASSIGN(ProfilePolicyConnector);
95 }; 96 };
96 97
97 } // namespace policy 98 } // namespace policy
98 99
99 #endif // CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_H_ 100 #endif // CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698