Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_BROWSER_POLICY_CONNECTOR_H_ | 5 #ifndef CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ |
| 6 #define CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ | 6 #define CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "chrome/browser/policy/cloud/cloud_policy_constants.h" | 14 #include "chrome/browser/policy/cloud/cloud_policy_constants.h" |
| 15 #include "chrome/browser/policy/configuration_policy_handler_list.h" | 15 #include "chrome/browser/policy/configuration_policy_handler_list.h" |
| 16 | 16 |
| 17 #if defined(OS_CHROMEOS) | 17 #if defined(OS_CHROMEOS) |
| 18 #include "chrome/browser/chromeos/policy/proxy_policy_provider.h" | 18 #include "chrome/browser/chromeos/policy/proxy_policy_provider.h" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| 21 #if defined(OS_CHROMEOS) | |
| 22 namespace chromeos { | |
| 23 namespace attestation { | |
| 24 class AttestationPolicyObserver; | |
| 25 }} | |
|
Mattias Nissler (ping if slow)
2013/03/27 14:16:34
braces on separate lines.
dkrahn
2013/03/27 21:20:44
Done.
| |
| 26 #endif | |
| 27 | |
| 21 class PrefRegistrySimple; | 28 class PrefRegistrySimple; |
| 22 class PrefService; | 29 class PrefService; |
| 23 class Profile; | 30 class Profile; |
| 24 | 31 |
| 25 namespace net { | 32 namespace net { |
| 26 class URLRequestContextGetter; | 33 class URLRequestContextGetter; |
| 27 } | 34 } |
| 28 | 35 |
| 29 namespace policy { | 36 namespace policy { |
| 30 | 37 |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 212 | 219 |
| 213 scoped_ptr<DeviceManagementService> device_management_service_; | 220 scoped_ptr<DeviceManagementService> device_management_service_; |
| 214 | 221 |
| 215 // Used to initialize the device policy subsystem once the message loops | 222 // Used to initialize the device policy subsystem once the message loops |
| 216 // are spinning. | 223 // are spinning. |
| 217 base::WeakPtrFactory<BrowserPolicyConnector> weak_ptr_factory_; | 224 base::WeakPtrFactory<BrowserPolicyConnector> weak_ptr_factory_; |
| 218 | 225 |
| 219 #if defined(OS_CHROMEOS) | 226 #if defined(OS_CHROMEOS) |
| 220 scoped_ptr<AppPackUpdater> app_pack_updater_; | 227 scoped_ptr<AppPackUpdater> app_pack_updater_; |
| 221 scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_; | 228 scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_; |
| 229 scoped_ptr<chromeos::attestation::AttestationPolicyObserver> | |
| 230 attestation_policy_observer_; | |
|
Mattias Nissler (ping if slow)
2013/03/27 14:16:34
Not sure this really belongs here. While this devi
dkrahn
2013/03/27 21:20:44
This is only for enterprise managed devices. I wa
Mattias Nissler (ping if slow)
2013/04/02 12:49:39
The rule is basically that we put the observers wh
dkrahn
2013/04/04 21:27:26
Understood, I think it does fit well with DeviceCl
| |
| 222 #endif | 231 #endif |
| 223 | 232 |
| 224 DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector); | 233 DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector); |
| 225 }; | 234 }; |
| 226 | 235 |
| 227 } // namespace policy | 236 } // namespace policy |
| 228 | 237 |
| 229 #endif // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ | 238 #endif // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ |
| OLD | NEW |