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

Unified Diff: chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.h

Issue 14192017: Extract certificate policy application from NetworkLibrary. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 8 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.h
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.h b/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.h
index fca611fca3527da905d33dcefa529ddbb9f8aaa7..97a739c03729247b5b763569c3f48968ed11eff5 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.h
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.h
@@ -18,6 +18,10 @@ namespace base {
class Value;
}
+namespace chromeos {
+class CertificateHandler;
+}
+
namespace policy {
class PolicyMap;
@@ -34,7 +38,8 @@ class NetworkConfigurationUpdaterImplCros
public:
NetworkConfigurationUpdaterImplCros(
PolicyService* policy_service,
- chromeos::NetworkLibrary* network_library);
+ chromeos::NetworkLibrary* network_library,
+ scoped_ptr<chromeos::CertificateHandler> certificate_handler);
virtual ~NetworkConfigurationUpdaterImplCros();
// NetworkProfileObserver overrides.
@@ -44,8 +49,6 @@ class NetworkConfigurationUpdaterImplCros
// In this implementation, this function applies both device and user policy.
virtual void OnUserPolicyInitialized() OVERRIDE;
- virtual void set_allow_trusted_certificates_from_policy(bool allow) OVERRIDE;
- virtual net::CertTrustAnchorProvider* GetCertTrustAnchorProvider() OVERRIDE;
private:
// Callback that's called by |policy_service_| if the respective ONC policy
@@ -70,19 +73,14 @@ class NetworkConfigurationUpdaterImplCros
// Network library to write network configuration to.
chromeos::NetworkLibrary* network_library_;
+ scoped_ptr<chromeos::CertificateHandler> certificate_handler_;
+
// Whether the user policy is already available.
bool user_policy_initialized_;
- // Whether Web trust is allowed or not.
- bool allow_trusted_certificates_from_policy_;
-
// The policy service storing the ONC policies.
PolicyService* policy_service_;
- // An implementation of CertTrustAnchorProvider. Owned by the updater, but
- // lives on the IO thread.
- net::CertTrustAnchorProvider* cert_trust_provider_;
-
DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationUpdaterImplCros);
};

Powered by Google App Engine
This is Rietveld 408576698