| Index: net/proxy/proxy_info.h
|
| diff --git a/net/proxy/proxy_info.h b/net/proxy/proxy_info.h
|
| index 2ff8136dc307ee4e36842b4ffbf5d46c813354e8..f48e6c9ea418e3ab608aeaf2d82743fbb7c7cfd9 100644
|
| --- a/net/proxy/proxy_info.h
|
| +++ b/net/proxy/proxy_info.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| @@ -82,6 +82,9 @@ class NET_EXPORT ProxyInfo {
|
| // to call this function.
|
| const ProxyServer& proxy_server() const { return proxy_list_.Get(); }
|
|
|
| + // Returns the source for configuration settings used for proxy resolution.
|
| + ProxyConfigSource config_source() const { return config_source_; }
|
| +
|
| // See description in ProxyList::ToPacString().
|
| std::string ToPacString() const;
|
|
|
| @@ -103,6 +106,9 @@ class NET_EXPORT ProxyInfo {
|
| return proxy_retry_info_;
|
| }
|
|
|
| + // Reset proxy and config settings.
|
| + void Reset();
|
| +
|
| // The ordered list of proxy servers (including DIRECT attempts) remaining to
|
| // try. If proxy_list_ is empty, then there is nothing left to fall back to.
|
| ProxyList proxy_list_;
|
| @@ -112,6 +118,9 @@ class NET_EXPORT ProxyInfo {
|
|
|
| // This value identifies the proxy config used to initialize this object.
|
| ProxyConfig::ID config_id_;
|
| +
|
| + // The source of the proxy settings used,
|
| + ProxyConfigSource config_source_;
|
| };
|
|
|
| } // namespace net
|
|
|