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

Unified Diff: chrome/browser/chromeos/proxy_config_service_impl.h

Issue 2306673002: arc: update proxy settings from UI and ONC policy. (Closed)
Patch Set: Fixed a comment. Created 4 years, 3 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/chromeos/proxy_config_service_impl.h
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h
index 93586a08c2b6695d7b5f5bcf134eef67e4628ac2..2b43064ffcf13cc392cdb0e273a8d181539d03c4 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.h
+++ b/chrome/browser/chromeos/proxy_config_service_impl.h
@@ -54,15 +54,19 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl,
void DefaultNetworkChanged(const NetworkState* network) override;
void OnShuttingDown() override;
- protected:
- friend class UIProxyConfigService;
-
// Returns true if proxy is to be ignored for this network profile and
// |onc_source|, e.g. this happens if the network is shared and
// use-shared-proxies is turned off. |profile_prefs| may be NULL.
static bool IgnoreProxy(const PrefService* profile_prefs,
const std::string network_profile_path,
- onc::ONCSource onc_source);
+ ::onc::ONCSource onc_source);
+
+ // Returns Pref Proxy configuration if available or a proxy config dictionary
+ // applied to the default network.
+ // Returns NULL if no Pref Proxy configuration and no active network.
+ // |profile_prefs| must be not NULL.
+ static std::unique_ptr<ProxyConfigDictionary> GetActiveProxyConfigDictionary(
+ const PrefService* profile_prefs);
private:
// Called when any proxy preference changes.
« no previous file with comments | « chrome/browser/chromeos/net/proxy_config_handler.h ('k') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698