| 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_script_decider.h" | 5 #include "net/proxy/proxy_script_decider.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/format_macros.h" | 10 #include "base/format_macros.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 // be dangerous should our top level domain registry become out of date. | 40 // be dangerous should our top level domain registry become out of date. |
| 41 // | 41 // |
| 42 // Instead we directly resolve "wpad", and let the operating system apply the | 42 // Instead we directly resolve "wpad", and let the operating system apply the |
| 43 // DNS suffix search paths. This is the same approach taken by Firefox, and | 43 // DNS suffix search paths. This is the same approach taken by Firefox, and |
| 44 // compatibility hasn't been an issue. | 44 // compatibility hasn't been an issue. |
| 45 // | 45 // |
| 46 // For more details, also check out this comment: | 46 // For more details, also check out this comment: |
| 47 // http://code.google.com/p/chromium/issues/detail?id=18575#c20 | 47 // http://code.google.com/p/chromium/issues/detail?id=18575#c20 |
| 48 static const char kWpadUrl[] = "http://wpad/wpad.dat"; | 48 static const char kWpadUrl[] = "http://wpad/wpad.dat"; |
| 49 | 49 |
| 50 Value* ProxyScriptDecider::PacSource::NetLogCallback( | 50 base::Value* ProxyScriptDecider::PacSource::NetLogCallback( |
| 51 const GURL* effective_pac_url, | 51 const GURL* effective_pac_url, |
| 52 NetLog::LogLevel /* log_level */) const { | 52 NetLog::LogLevel /* log_level */) const { |
| 53 DictionaryValue* dict = new DictionaryValue(); | 53 base::DictionaryValue* dict = new base::DictionaryValue(); |
| 54 std::string source; | 54 std::string source; |
| 55 switch (type) { | 55 switch (type) { |
| 56 case PacSource::WPAD_DHCP: | 56 case PacSource::WPAD_DHCP: |
| 57 source = "WPAD DHCP"; | 57 source = "WPAD DHCP"; |
| 58 break; | 58 break; |
| 59 case PacSource::WPAD_DNS: | 59 case PacSource::WPAD_DNS: |
| 60 source = "WPAD DNS: "; | 60 source = "WPAD DNS: "; |
| 61 source += effective_pac_url->possibly_invalid_spec(); | 61 source += effective_pac_url->possibly_invalid_spec(); |
| 62 break; | 62 break; |
| 63 case PacSource::CUSTOM: | 63 case PacSource::CUSTOM: |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 } | 405 } |
| 406 | 406 |
| 407 // This is safe to call in any state. | 407 // This is safe to call in any state. |
| 408 if (dhcp_proxy_script_fetcher_) | 408 if (dhcp_proxy_script_fetcher_) |
| 409 dhcp_proxy_script_fetcher_->Cancel(); | 409 dhcp_proxy_script_fetcher_->Cancel(); |
| 410 | 410 |
| 411 DidComplete(); | 411 DidComplete(); |
| 412 } | 412 } |
| 413 | 413 |
| 414 } // namespace net | 414 } // namespace net |
| OLD | NEW |