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

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

Issue 2188163003: MD Settings: Internet: Add 'forget' button, more fixes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_609156_internet_cleanup_6a
Patch Set: . Created 4 years, 5 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
Index: chrome/browser/resources/settings/internet_page/internet_detail_page.js
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.js b/chrome/browser/resources/settings/internet_page/internet_detail_page.js
index 32112ac0099babe2cbbd2feb67dd7ea0cd10f496..1999695dbb5e0045b1f3bab7c011fafd1e896183 100644
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.js
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.js
@@ -114,15 +114,30 @@ Polymer({
},
/** @override */
+ ready: function() {
+ if (!this.guid)
+ this.close_();
+ },
+
+ /** @override */
detached: function() {
this.networkingPrivate.onNetworksChanged.removeListener(
this.networksChangedListener_);
},
/** @private */
+ close_: function() {
+ // Delay sending subpage-back until the next render frame to allow other
+ // subpages to load first.
+ setTimeout(function() {
+ this.fire('subpage-back');
+ }.bind(this));
dschuyler 2016/07/28 22:03:55 setTimeout and async come up as problems often eno
stevenjb 2016/07/28 22:15:50 I tried many things, but nothing else worked relia
dschuyler 2016/07/29 23:13:31 Based on the conversation in the stand-up this mor
stevenjb 2016/08/02 23:40:34 Acknowledged.
+ },
+
+ /** @private */
guidChanged_: function() {
if (!this.guid)
- return;
+ this.close_();
this.getNetworkDetails_();
},
@@ -198,7 +213,7 @@ Polymer({
if (!properties) {
// If |properties| becomes null (i.e. the network is no longer visible),
// close the page.
- this.fire('close');
+ this.close_();
}
},
@@ -297,6 +312,17 @@ Polymer({
* @return {boolean}
* @private
*/
+ showForget_: function(networkProperties) {
dschuyler 2016/07/28 22:03:55 @param for networkProperties.
stevenjb 2016/07/28 22:15:50 Not needed for declared properties. Closure is sma
stevenjb 2016/08/02 23:40:34 Now using this.networkProperties, parameter remove
+ var type = networkProperties.Type;
+ if (type != CrOnc.Type.WI_FI && type != CrOnc.Type.VPN)
+ return false;
+ return this.isRemembered_(networkProperties);
+ },
+
+ /**
+ * @return {boolean}
+ * @private
+ */
showActivate_: function(networkProperties) {
dschuyler 2016/07/28 22:03:55 @param
stevenjb 2016/07/28 22:15:50 Acknowledged.
if (networkProperties.Type != CrOnc.Type.CELLULAR)
return false;
@@ -368,6 +394,11 @@ Polymer({
},
/** @private */
+ onForgetTap_: function() {
+ this.networkingPrivate.forgetNetwork(this.guid);
+ },
+
+ /** @private */
onActivateTap_: function() {
this.networkingPrivate.startActivate(this.guid);
},

Powered by Google App Engine
This is Rietveld 408576698