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

Unified Diff: chrome/browser/resources/settings/internet_page/network_proxy.js

Issue 2422423002: Use md-select instead of paper-dropdown-menu-light in internet page (Closed)
Patch Set: Use data binding + async Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/settings/internet_page/network_proxy.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cc22995f52c3f20dfb348eaa2ce54f7be55d6089..6f7de41b76541294414562b8202e5aa6d8de1997 100644
--- a/chrome/browser/resources/settings/internet_page/network_proxy.js
+++ b/chrome/browser/resources/settings/internet_page/network_proxy.js
@@ -102,9 +102,7 @@ Polymer({
*/
savedExcludeDomains_: undefined,
- /**
- * Polymer networkProperties changed method.
- */
+ /** @private */
networkPropertiesChanged_: function() {
if (!this.networkProperties)
return;
@@ -139,7 +137,10 @@ Polymer({
proxy.ExcludeDomains = proxy.ExcludeDomains || this.savedExcludeDomains_;
proxy.Manual = proxy.Manual || this.savedManual_;
- this.proxy = proxy;
+ // Set this.proxy after dom-repeat has been stamped.
+ this.async(function() {
+ this.proxy = proxy;
+ }.bind(this));
// Set the Web Proxy Auto Discovery URL.
var ipv4 =
@@ -147,8 +148,14 @@ Polymer({
this.WPAD = (ipv4 && ipv4.WebProxyAutoDiscoveryUrl) || '';
},
+ /** @private */
+ useSameProxyChanged_: function() {
dpapad 2016/10/18 00:09:51 Nit: This seems to have been moved, no modificatio
stevenjb 2016/10/18 00:32:57 I've been fixing ordering and comments to be consi
+ this.sendProxyChange_();
+ },
+
/**
* @return {CrOnc.ProxySettings} An empty/default proxy settings object.
+ * @private
*/
createDefaultProxySettings_: function() {
return {
@@ -165,14 +172,8 @@ Polymer({
},
/**
- * Polymer useSameProxy changed method.
- */
- useSameProxyChanged_: function() {
- this.sendProxyChange_();
- },
-
- /**
* Called when the proxy changes in the UI.
+ * @private
*/
sendProxyChange_: function() {
if (this.proxy.Type == CrOnc.ProxySettingsType.MANUAL) {
@@ -205,12 +206,13 @@ Polymer({
/**
* Event triggered when the selected proxy type changes.
- * @param {!{detail: !{selected: string}}} e
+ * @param {!Event} event
* @private
*/
- onTypeChange_: function(e) {
+ onTypeChange_: function(event) {
+ let target = /** @type {!HTMLSelectElement} */ (event.target);
var type = /** @type {chrome.networkingPrivate.ProxySettingsType} */ (
- e.detail.selected);
+ target.value);
this.set('proxy.Type', type);
this.sendProxyChange_();
},
« no previous file with comments | « chrome/browser/resources/settings/internet_page/network_proxy.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698