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

Unified Diff: chrome/browser/chromeos/ui_proxy_config_service.cc

Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 6 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/ui_proxy_config_service.cc
diff --git a/chrome/browser/chromeos/ui_proxy_config_service.cc b/chrome/browser/chromeos/ui_proxy_config_service.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c0d4047b66208f76218840e447a9e1c60a71992a
--- /dev/null
+++ b/chrome/browser/chromeos/ui_proxy_config_service.cc
@@ -0,0 +1,239 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/ui_proxy_config_service.h"
+
+#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/values.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/cros/network_property_ui_data.h"
+#include "chrome/browser/chromeos/proxy_config_service_impl.h"
+#include "chromeos/network/onc/onc_utils.h"
+#include "grit/generated_resources.h"
+#include "net/proxy/proxy_config.h"
+#include "ui/base/l10n/l10n_util.h"
+
+namespace chromeos {
+
+namespace {
+
+class ClosureEquals {
+ public:
+ explicit ClosureEquals(const base::Closure& closure)
+ : closure_(closure) { }
+ bool operator() (const base::Closure& other) {
+ return closure_.Equals(other);
+ }
+ private:
+ const base::Closure& closure_;
+};
+
+const char* ModeToString(UIProxyConfig::Mode mode) {
+ switch (mode) {
+ case UIProxyConfig::MODE_DIRECT:
+ return "direct";
+ case UIProxyConfig::MODE_AUTO_DETECT:
+ return "auto-detect";
+ case UIProxyConfig::MODE_PAC_SCRIPT:
+ return "pacurl";
+ case UIProxyConfig::MODE_SINGLE_PROXY:
+ return "single-proxy";
+ case UIProxyConfig::MODE_PROXY_PER_SCHEME:
+ return "proxy-per-scheme";
+ }
+ NOTREACHED() << "Unrecognized mode type";
+ return "";
+}
+
+bool ParseProxyConfig(const std::string& pref_proxy_config,
+ net::ProxyConfig* proxy_config) {
+ if (pref_proxy_config.empty())
+ return false;
+
+ scoped_ptr<base::DictionaryValue> proxy_config_dict(
+ chromeos::onc::ReadDictionaryFromJson(pref_proxy_config));
+ if (!proxy_config_dict) {
+ LOG(WARNING) << "Failed to parse proxy config.";
+ return false;
+ }
+
+ ProxyConfigDictionary proxy_config_dict_wrapper(proxy_config_dict.get());
+ return PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
+ proxy_config_dict_wrapper,
+ proxy_config);
+}
+
+// Returns true if proxy settings of |network| are editable.
+bool IsNetworkProxySettingsEditable(const Network& network) {
+ NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+ const base::DictionaryValue* onc =
+ network_library->FindOncForNetwork(network.unique_id());
+ if (!onc)
+ return true;
+
+ NetworkPropertyUIData proxy_settings_ui_data;
+ proxy_settings_ui_data.ParseOncProperty(
+ network.ui_data().onc_source(),
+ onc,
+ onc::network_config::kProxySettings);
+ return proxy_settings_ui_data.IsEditable();
+}
+
+} // namespace
+
+UIProxyConfigService::UIProxyConfigService(PrefService* pref_service)
+ : pref_service_(pref_service) {
+}
+
+UIProxyConfigService::~UIProxyConfigService() {
+}
+
+void UIProxyConfigService::SetCurrentNetwork(
+ const std::string& current_network) {
+ Network* network = NULL;
+ if (!current_network.empty()) {
+ network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
+ current_network);
+ LOG_IF(ERROR, !network)
+ << "Can't find requested network " << current_network;
+ }
+ current_ui_network_ = current_network;
+ if (!network) {
+ current_ui_network_.clear();
+ current_ui_config_ = UIProxyConfig();
+ return;
+ }
+
+ DetermineEffectiveConfig(*network);
+ VLOG(1) << "Current ui network: "
+ << network->name()
+ << ", " << ModeToString(current_ui_config_.mode) << ", "
+ << ProxyPrefs::ConfigStateToDebugString(current_ui_config_.state)
+ << ", modifiable:" << current_ui_config_.user_modifiable;
+ // Notify observers.
+ std::vector<base::Closure>::iterator iter = callbacks_.begin();
+ while (iter != callbacks_.end()) {
+ if (iter->is_null()) {
+ iter = callbacks_.erase(iter);
+ } else {
+ iter->Run();
+ ++iter;
+ }
+ }
+}
+
+void UIProxyConfigService::MakeActiveNetworkCurrent() {
+ const Network* network =
+ CrosLibrary::Get()->GetNetworkLibrary()->active_network();
+ SetCurrentNetwork(network ? network->service_path() : std::string());
+}
+
+void UIProxyConfigService::GetCurrentNetworkName(std::string* network_name) {
+ if (!network_name)
+ return;
+ network_name->clear();
+ Network* network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
+ current_ui_network_);
+ if (!network) {
+ LOG(ERROR) << "Can't find requested network " << current_ui_network_;
+ return;
+ }
+ if (network->name().empty() && network->type() == chromeos::TYPE_ETHERNET) {
+ *network_name =
+ l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
+ } else {
+ *network_name = network->name();
+ }
+}
+
+void UIProxyConfigService::GetProxyConfig(UIProxyConfig* config) {
+ *config = current_ui_config_;
+}
+
+void UIProxyConfigService::SetProxyConfig(const UIProxyConfig& config) {
+ current_ui_config_ = config;
+ if (current_ui_network_.empty())
+ return;
+
+ // Update config to shill.
+ std::string value;
+ if (!current_ui_config_.SerializeForNetwork(&value))
+ return;
+
+ VLOG(1) << "Set proxy (mode=" << current_ui_config_.mode
+ << ") for " << current_ui_network_;
+ current_ui_config_.state = ProxyPrefs::CONFIG_SYSTEM;
+
+ // Set ProxyConfig of the current network.
+ Network* network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
+ current_ui_network_);
+ if (!network) {
+ NOTREACHED() << "Can't find requested network " << current_ui_network_;
+ return;
+ }
+ network->SetProxyConfig(value);
+ VLOG(1) << "Set proxy for "
+ << (network->name().empty() ? current_ui_network_ : network->name())
+ << ", value=" << value;
+}
+
+void UIProxyConfigService::AddNotificationCallback(base::Closure callback) {
+ std::vector<base::Closure>::iterator iter = std::find_if(
+ callbacks_.begin(), callbacks_.end(), ClosureEquals(callback));
+ if (iter == callbacks_.end())
+ callbacks_.push_back(callback);
+}
+
+void UIProxyConfigService::RemoveNotificationCallback(base::Closure callback) {
+ std::vector<base::Closure>::iterator iter = std::find_if(
+ callbacks_.begin(), callbacks_.end(), ClosureEquals(callback));
+ if (iter != callbacks_.end())
+ callbacks_.erase(iter);
+}
+
+void UIProxyConfigService::DetermineEffectiveConfig(const Network& network) {
+ // Get prefs proxy config if available.
+ net::ProxyConfig pref_config;
+ ProxyPrefs::ConfigState pref_state = ProxyConfigServiceImpl::ReadPrefConfig(
+ pref_service_, &pref_config);
+
+ // Get network proxy config if available.
+ net::ProxyConfig network_config;
+ net::ProxyConfigService::ConfigAvailability network_availability =
+ net::ProxyConfigService::CONFIG_UNSET;
+ if (ParseProxyConfig(network.proxy_config(), &network_config)) {
+ // Network is private or shared with user using shared proxies.
+ VLOG(1) << this << ": using network proxy: " << network.proxy_config();
+ network_availability = net::ProxyConfigService::CONFIG_VALID;
+ }
+
+ // Determine effective proxy config, either from prefs or network.
+ ProxyPrefs::ConfigState effective_config_state;
+ net::ProxyConfig effective_config;
+ ProxyConfigServiceImpl::GetEffectiveProxyConfig(
+ pref_state, pref_config,
+ network_availability, network_config, false,
+ &effective_config_state, &effective_config);
+
+ // Store effective proxy into |current_ui_config_|.
+ current_ui_config_.FromNetProxyConfig(effective_config);
+ current_ui_config_.state = effective_config_state;
+ if (ProxyConfigServiceImpl::PrefPrecedes(effective_config_state)) {
+ current_ui_config_.user_modifiable = false;
+ } else if (!IsNetworkProxySettingsEditable(network)) {
+ // TODO(xiyuan): Figure out the right way to set config state for managed
+ // network.
+ current_ui_config_.state = ProxyPrefs::CONFIG_POLICY;
+ current_ui_config_.user_modifiable = false;
+ } else {
+ current_ui_config_.user_modifiable =
+ !ProxyConfigServiceImpl::IgnoreProxy(pref_service_,
+ network.profile_path(),
+ network.ui_data().onc_source());
+ }
+}
+
+} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/ui_proxy_config_service.h ('k') | chrome/browser/net/pref_proxy_config_tracker_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698