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

Unified Diff: chromeos/network/network_handler.h

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 | « chrome/browser/ui/webui/options/preferences_browsertest.cc ('k') | chromeos/network/network_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_handler.h
diff --git a/chromeos/network/network_handler.h b/chromeos/network/network_handler.h
index b2eea05c0519e88f7fdeece0bdfca77b090a5dc9..445944b9f801dd900f6462d02500a66ed0a4822f 100644
--- a/chromeos/network/network_handler.h
+++ b/chromeos/network/network_handler.h
@@ -12,6 +12,8 @@
#include "base/single_thread_task_runner.h"
#include "chromeos/chromeos_export.h"
+class PrefService;
+
namespace chromeos {
class AutoConnectHandler;
@@ -29,6 +31,7 @@ class NetworkProfileHandler;
class NetworkStateHandler;
class NetworkSmsHandler;
class ProhibitedTechnologiesHandler;
+class UIProxyConfigService;
// Class for handling initialization and access to chromeos network handlers.
// This class should NOT be used in unit tests. Instead, construct individual
@@ -47,6 +50,17 @@ class CHROMEOS_EXPORT NetworkHandler {
// Returns true if the global instance has been initialized.
static bool IsInitialized();
+ // Called whenever the pref services change, e.g. on login. Initializes
+ // services with PrefService dependencies (i.e. ui_proxy_config_service).
+ // |logged_in_profile_prefs| is the PrefService associated with the logged
+ // in user profile. |device_prefs| is the PrefService associated with the
+ // device (e.g. in Chrome, g_browser_process->local_state()).
+ void InitializePrefServices(PrefService* logged_in_profile_prefs,
+ PrefService* device_prefs);
+
+ // Must be called before pref services are shut down.
+ void ShutdownPrefServices();
+
// Returns the task runner for posting NetworkHandler calls from other
// threads.
base::SingleThreadTaskRunner* task_runner() { return task_runner_.get(); }
@@ -65,6 +79,9 @@ class CHROMEOS_EXPORT NetworkHandler {
GeolocationHandler* geolocation_handler();
ProhibitedTechnologiesHandler* prohibited_technologies_handler();
+ // Global network configuration services.
+ UIProxyConfigService* ui_proxy_config_service();
+
private:
NetworkHandler();
virtual ~NetworkHandler();
@@ -88,6 +105,7 @@ class CHROMEOS_EXPORT NetworkHandler {
std::unique_ptr<GeolocationHandler> geolocation_handler_;
std::unique_ptr<ProhibitedTechnologiesHandler>
prohibited_technologies_handler_;
+ std::unique_ptr<UIProxyConfigService> ui_proxy_config_service_;
DISALLOW_COPY_AND_ASSIGN(NetworkHandler);
};
« no previous file with comments | « chrome/browser/ui/webui/options/preferences_browsertest.cc ('k') | chromeos/network/network_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698