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

Side by Side Diff: net/proxy/proxy_service.cc

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/proxy/proxy_service.h" 5 #include "net/proxy/proxy_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 for (ProxyRetryInfoMap::const_iterator iter = retry_info->begin(); 283 for (ProxyRetryInfoMap::const_iterator iter = retry_info->begin();
284 iter != retry_info->end(); ++iter) { 284 iter != retry_info->end(); ++iter) {
285 list->Append(new base::StringValue(iter->first)); 285 list->Append(new base::StringValue(iter->first));
286 } 286 }
287 dict->Set("bad_proxy_list", list); 287 dict->Set("bad_proxy_list", list);
288 return dict; 288 return dict;
289 } 289 }
290 290
291 // Returns NetLog parameters on a successfuly proxy resolution. 291 // Returns NetLog parameters on a successfuly proxy resolution.
292 base::Value* NetLogFinishedResolvingProxyCallback( 292 base::Value* NetLogFinishedResolvingProxyCallback(
293 ProxyInfo* result, 293 const ProxyInfo* result,
294 NetLog::LogLevel /* log_level */) { 294 NetLog::LogLevel /* log_level */) {
295 base::DictionaryValue* dict = new base::DictionaryValue(); 295 base::DictionaryValue* dict = new base::DictionaryValue();
296 dict->SetString("pac_string", result->ToPacString()); 296 dict->SetString("pac_string", result->ToPacString());
297 return dict; 297 return dict;
298 } 298 }
299 299
300 #if defined(OS_CHROMEOS) 300 #if defined(OS_CHROMEOS)
301 class UnsetProxyConfigService : public ProxyConfigService { 301 class UnsetProxyConfigService : public ProxyConfigService {
302 public: 302 public:
303 UnsetProxyConfigService() {} 303 UnsetProxyConfigService() {}
(...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1581 State previous_state = ResetProxyConfig(false); 1581 State previous_state = ResetProxyConfig(false);
1582 if (previous_state != STATE_NONE) 1582 if (previous_state != STATE_NONE)
1583 ApplyProxyConfigIfAvailable(); 1583 ApplyProxyConfigIfAvailable();
1584 } 1584 }
1585 1585
1586 void ProxyService::OnDNSChanged() { 1586 void ProxyService::OnDNSChanged() {
1587 OnIPAddressChanged(); 1587 OnIPAddressChanged();
1588 } 1588 }
1589 1589
1590 } // namespace net 1590 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698