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

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

Issue 4715001: Merge 65401 - A bunch of proxy DOMUI changes.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552c/src/
Patch Set: Created 10 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
Index: chrome/browser/chromeos/proxy_config_service_impl.cc
===================================================================
--- chrome/browser/chromeos/proxy_config_service_impl.cc (revision 65413)
+++ chrome/browser/chromeos/proxy_config_service_impl.cc (working copy)
@@ -409,12 +409,8 @@
CheckCurrentlyOnUIThread();
reference_config_.mode = ProxyConfig::MODE_PAC_SCRIPT;
reference_config_.automatic_proxy.pac_url = pac_url;
- if (pac_url.is_valid()) {
- OnUISetProxyConfig(true);
- return true;
- }
- LOG(INFO) << "Cannot set proxy: invalid pac url";
- return false;
+ OnUISetProxyConfig(true);
+ return true;
}
bool ProxyConfigServiceImpl::UISetProxyConfigToSingleProxy(
@@ -423,12 +419,8 @@
CheckCurrentlyOnUIThread();
reference_config_.mode = ProxyConfig::MODE_SINGLE_PROXY;
reference_config_.single_proxy.server = server;
- if (server.is_valid()) {
- OnUISetProxyConfig(true);
- return true;
- }
- LOG(INFO) << "Cannot set proxy: invalid single server";
- return false;
+ OnUISetProxyConfig(true);
+ return true;
}
bool ProxyConfigServiceImpl::UISetProxyConfigToProxyPerScheme(
@@ -450,12 +442,8 @@
}
reference_config_.mode = ProxyConfig::MODE_PROXY_PER_SCHEME;
proxy->server = server;
- if (server.is_valid()) {
- OnUISetProxyConfig(true);
- return true;
- }
- LOG(INFO) << "Cannot set proxy: invalid " << scheme << " server";
- return false;
+ OnUISetProxyConfig(true);
+ return true;
}
bool ProxyConfigServiceImpl::UISetProxyConfigBypassRules(
« no previous file with comments | « chrome/browser/chromeos/cros_settings_provider_proxy.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698