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

Unified Diff: chromeos/network/network_handler.cc

Issue 2446893008: NetworkHandler: Add ui_proxy_config_service (Closed)
Patch Set: Feedback + elim bogus shill errors Created 4 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
Index: chromeos/network/network_handler.cc
diff --git a/chromeos/network/network_handler.cc b/chromeos/network/network_handler.cc
index d1c1b51673ac0ddc8ceadfd6e41ff0bbf079c718..b0ec680cd245a31d1fc3f7fb0c3eb45009f33162 100644
--- a/chromeos/network/network_handler.cc
+++ b/chromeos/network/network_handler.cc
@@ -22,6 +22,7 @@
#include "chromeos/network/network_state_handler.h"
#include "chromeos/network/network_state_handler_observer.h"
#include "chromeos/network/prohibited_technologies_handler.h"
+#include "chromeos/network/proxy/ui_proxy_config_service.h"
namespace chromeos {
@@ -112,6 +113,12 @@ bool NetworkHandler::IsInitialized() {
return g_network_handler;
}
+void NetworkHandler::InitializePrefServices(PrefService* device_prefs,
+ PrefService* profile_prefs) {
+ ui_proxy_config_service_.reset(
+ new UIProxyConfigService(device_prefs, profile_prefs));
+}
+
NetworkStateHandler* NetworkHandler::network_state_handler() {
return network_state_handler_.get();
}
@@ -154,4 +161,9 @@ NetworkHandler::prohibited_technologies_handler() {
return prohibited_technologies_handler_.get();
}
+UIProxyConfigService* NetworkHandler::ui_proxy_config_service() {
+ CHECK(ui_proxy_config_service_.get());
+ return ui_proxy_config_service_.get();
+}
+
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698