| Index: chrome/browser/resources/settings/internet_page/network_proxy.js
|
| diff --git a/chrome/browser/resources/settings/internet_page/network_proxy.js b/chrome/browser/resources/settings/internet_page/network_proxy.js
|
| index 9f2ef04899b8224ad9648029733a935bf80b95b7..20e6ea502fdad68471354b3d6aa506b47123916e 100644
|
| --- a/chrome/browser/resources/settings/internet_page/network_proxy.js
|
| +++ b/chrome/browser/resources/settings/internet_page/network_proxy.js
|
| @@ -22,9 +22,7 @@ Polymer({
|
| observer: 'networkPropertiesChanged_',
|
| },
|
|
|
| - /**
|
| - * Whether or not the proxy values can be edited.
|
| - */
|
| + /** Whether or not the proxy values can be edited. */
|
| editable: {
|
| type: Boolean,
|
| value: false,
|
| @@ -41,18 +39,14 @@ Polymer({
|
| },
|
| },
|
|
|
| - /**
|
| - * The Web Proxy Auto Discovery URL extracted from networkProperties.
|
| - */
|
| + /** The Web Proxy Auto Discovery URL extracted from networkProperties. */
|
| WPAD: {
|
| type: String,
|
| value: '',
|
| },
|
|
|
| - /**
|
| - * Whetner or not to use the same manual proxy for all protocols.
|
| - */
|
| - useSameProxy: {
|
| + /** Whetner or not to use the same manual proxy for all protocols. */
|
| + useSameProxy_: {
|
| type: Boolean,
|
| value: false,
|
| observer: 'useSameProxyChanged_',
|
| @@ -184,15 +178,15 @@ Polymer({
|
| var defaultProxy = proxy.Manual.HTTPProxy;
|
| if (!defaultProxy || !defaultProxy.Host)
|
| return;
|
| - if (this.useSameProxy || !proxy.Manual.SecureHTTPProxy) {
|
| + if (this.useSameProxy_ || !proxy.Manual.SecureHTTPProxy) {
|
| proxy.Manual.SecureHTTPProxy = /** @type {!CrOnc.ProxyLocation} */ (
|
| Object.assign({}, defaultProxy));
|
| }
|
| - if (this.useSameProxy || !proxy.Manual.FTPProxy) {
|
| + if (this.useSameProxy_ || !proxy.Manual.FTPProxy) {
|
| proxy.Manual.FTPProxy = /** @type {!CrOnc.ProxyLocation} */ (
|
| Object.assign({}, defaultProxy));
|
| }
|
| - if (this.useSameProxy || !proxy.Manual.SOCKS) {
|
| + if (this.useSameProxy_ || !proxy.Manual.SOCKS) {
|
| proxy.Manual.SOCKS = /** @type {!CrOnc.ProxyLocation} */ (
|
| Object.assign({}, defaultProxy));
|
| }
|
|
|