OLD | NEW |
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 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 dict->SetString("pac_string", result->ToPacString()); | 366 dict->SetString("pac_string", result->ToPacString()); |
367 return dict; | 367 return dict; |
368 } | 368 } |
369 | 369 |
370 #if defined(OS_CHROMEOS) | 370 #if defined(OS_CHROMEOS) |
371 class UnsetProxyConfigService : public ProxyConfigService { | 371 class UnsetProxyConfigService : public ProxyConfigService { |
372 public: | 372 public: |
373 UnsetProxyConfigService() {} | 373 UnsetProxyConfigService() {} |
374 virtual ~UnsetProxyConfigService() {} | 374 virtual ~UnsetProxyConfigService() {} |
375 | 375 |
376 virtual void AddObserver(Observer* observer) {} | 376 virtual void AddObserver(Observer* observer) OVERRIDE {} |
377 virtual void RemoveObserver(Observer* observer) {} | 377 virtual void RemoveObserver(Observer* observer) OVERRIDE {} |
378 virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) { | 378 virtual ConfigAvailability GetLatestProxyConfig( |
| 379 ProxyConfig* config) OVERRIDE { |
379 return CONFIG_UNSET; | 380 return CONFIG_UNSET; |
380 } | 381 } |
381 }; | 382 }; |
382 #endif | 383 #endif |
383 | 384 |
384 } // namespace | 385 } // namespace |
385 | 386 |
386 // ProxyService::InitProxyResolver -------------------------------------------- | 387 // ProxyService::InitProxyResolver -------------------------------------------- |
387 | 388 |
388 // This glues together two asynchronous steps: | 389 // This glues together two asynchronous steps: |
(...skipping 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1629 OnCompletion(result_); | 1630 OnCompletion(result_); |
1630 } | 1631 } |
1631 } | 1632 } |
1632 | 1633 |
1633 void SyncProxyServiceHelper::OnCompletion(int rv) { | 1634 void SyncProxyServiceHelper::OnCompletion(int rv) { |
1634 result_ = rv; | 1635 result_ = rv; |
1635 event_.Signal(); | 1636 event_.Signal(); |
1636 } | 1637 } |
1637 | 1638 |
1638 } // namespace net | 1639 } // namespace net |
OLD | NEW |