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

Unified Diff: chrome/browser/policy/browser_policy_connector.cc

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/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 4bc9cb4ff369ecdaed2248e34796615756a3f0ca..09e42fa77fca93003b6bc132c6e8fd4fa65c9f8a 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -73,6 +73,8 @@
#include "chromeos/cryptohome/cryptohome_library.h"
#include "chromeos/dbus/cryptohome_client.h"
#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/certificate_handler.h"
+#include "chromeos/network/managed_network_configuration_handler.h"
#else
#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
@@ -408,12 +410,16 @@ NetworkConfigurationUpdater*
if (command_line->HasSwitch(
chromeos::switches::kUseNewNetworkConfigurationHandlers)) {
network_configuration_updater_.reset(
- new NetworkConfigurationUpdaterImpl(GetPolicyService()));
+ new NetworkConfigurationUpdaterImpl(
+ GetPolicyService(),
+ chromeos::ManagedNetworkConfigurationHandler::Get(),
+ make_scoped_ptr(new chromeos::CertificateHandler)));
} else {
network_configuration_updater_.reset(
new NetworkConfigurationUpdaterImplCros(
GetPolicyService(),
- chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
+ chromeos::CrosLibrary::Get()->GetNetworkLibrary(),
+ make_scoped_ptr(new chromeos::CertificateHandler)));
}
}
return network_configuration_updater_.get();

Powered by Google App Engine
This is Rietveld 408576698