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

Unified Diff: chromeos/network/network_handler.cc

Issue 2446893008: NetworkHandler: Add ui_proxy_config_service (Closed)
Patch Set: Add NetworkHandler::ShutdownPrefServices 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
« no previous file with comments | « chromeos/network/network_handler.h ('k') | chromeos/network/proxy/ui_proxy_config_service.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 d1c1b51673ac0ddc8ceadfd6e41ff0bbf079c718..2039b92d28ae939b03b454aad5e355630b367c5b 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,17 @@ bool NetworkHandler::IsInitialized() {
return g_network_handler;
}
+void NetworkHandler::InitializePrefServices(
+ PrefService* logged_in_profile_prefs,
+ PrefService* device_prefs) {
+ ui_proxy_config_service_.reset(
+ new UIProxyConfigService(logged_in_profile_prefs, device_prefs));
+}
+
+void NetworkHandler::ShutdownPrefServices() {
+ ui_proxy_config_service_.reset();
+}
+
NetworkStateHandler* NetworkHandler::network_state_handler() {
return network_state_handler_.get();
}
@@ -154,4 +166,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
« no previous file with comments | « chromeos/network/network_handler.h ('k') | chromeos/network/proxy/ui_proxy_config_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698