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

Unified Diff: chromeos/network/network_handler.cc

Issue 701863002: Trigger ConnectToBestNetwork in more cases. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get_network_configs_from_policy
Patch Set: Fixed destruction order in NetworkHandler. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/network_handler.h ('k') | chromeos/network/network_policy_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_handler.cc
diff --git a/chromeos/network/network_handler.cc b/chromeos/network/network_handler.cc
index ae2671046c0c35981dc4200bdba16d0ad0fae0c5..e54c9351717f6f68ec376deff462ae956f97bdb6 100644
--- a/chromeos/network/network_handler.cc
+++ b/chromeos/network/network_handler.cc
@@ -6,6 +6,7 @@
#include "base/threading/worker_pool.h"
#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/auto_connect_handler.h"
#include "chromeos/network/client_cert_resolver.h"
#include "chromeos/network/geolocation_handler.h"
#include "chromeos/network/managed_network_configuration_handler_impl.h"
@@ -38,6 +39,7 @@ NetworkHandler::NetworkHandler()
managed_network_configuration_handler_.reset(
new ManagedNetworkConfigurationHandlerImpl());
if (CertLoader::IsInitialized()) {
+ auto_connect_handler_.reset(new AutoConnectHandler());
network_cert_migrator_.reset(new NetworkCertMigrator());
client_cert_resolver_.reset(new ClientCertResolver());
}
@@ -71,6 +73,12 @@ void NetworkHandler::Init() {
client_cert_resolver_->Init(network_state_handler_.get(),
managed_network_configuration_handler_.get());
}
+ if (auto_connect_handler_) {
+ auto_connect_handler_->Init(client_cert_resolver_.get(),
+ network_connection_handler_.get(),
+ network_state_handler_.get(),
+ managed_network_configuration_handler_.get());
+ }
network_sms_handler_->Init();
geolocation_handler_->Init();
}
« no previous file with comments | « chromeos/network/network_handler.h ('k') | chromeos/network/network_policy_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698