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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_state_informer.cc

Issue 15294010: Remove NetworkStateInformer's dependency on ProxyConfigServiceImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased on Gaurav's CL 15359008. Created 7 years, 7 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/ui/webui/chromeos/login/network_state_informer.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc b/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
index 555239d0cfcc7604261071f857ac002e691d75df..5c9684d5f88d549a4c578b8554e8b358a4a05620 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
@@ -7,7 +7,8 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "chrome/browser/chromeos/proxy_config_service_impl.h"
+#include "chrome/browser/prefs/proxy_config_dictionary.h"
+#include "chrome/browser/prefs/proxy_prefs.h"
#include "chrome/common/chrome_notification_types.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
@@ -212,19 +213,9 @@ NetworkStateInformer::State NetworkStateInformer::GetNetworkState(
bool NetworkStateInformer::IsProxyConfigured(const NetworkState* network) {
DCHECK(network);
- ProxyStateMap::iterator it = proxy_state_map_.find(network->guid());
- if (it != proxy_state_map_.end() &&
- it->second.proxy_config == network->proxy_config()) {
- return it->second.configured;
- }
- net::ProxyConfig proxy_config;
- if (!ProxyConfigServiceImpl::ParseProxyConfig(network->proxy_config(),
- &proxy_config))
- return false;
- bool configured = !proxy_config.proxy_rules().empty();
- proxy_state_map_[network->guid()] =
- ProxyState(network->proxy_config(), configured);
- return configured;
+ ProxyConfigDictionary proxy_dict(&network->proxy_config());
+ ProxyPrefs::ProxyMode mode;
+ return !proxy_dict.GetMode(&mode) || mode == ProxyPrefs::MODE_FIXED_SERVERS;
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698