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

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

Issue 2848683003: MD Settings: Add settings-internet-config (WiFi only, no certs) (Closed)
Patch Set: Rebase + add histogram enum Created 3 years, 7 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_page.js
diff --git a/chrome/browser/resources/settings/internet_page/internet_page.js b/chrome/browser/resources/settings/internet_page/internet_page.js
index 116f714255f7eba405784d0b882dce051d191f72..22cd5ee16de8067fbb2fbf425c18537161eebd55 100644
--- a/chrome/browser/resources/settings/internet_page/internet_page.js
+++ b/chrome/browser/resources/settings/internet_page/internet_page.js
@@ -105,6 +105,7 @@ Polymer({
listeners: {
'device-enabled-toggled': 'onDeviceEnabledToggled_',
'network-connect': 'onNetworkConnect_',
+ 'show-config': 'onShowConfig_',
'show-detail': 'onShowDetail_',
'show-known-networks': 'onShowKnownNetworks_',
'show-networks': 'onShowNetworks_',
@@ -215,6 +216,32 @@ Polymer({
},
/**
+ * @param {!{detail: !CrOnc.NetworkProperties}} event
+ * @private
+ */
+ onShowConfig_: function(event) {
+ var properties = event.detail;
+ this.showConfig_(
+ properties.Type, properties.GUID, CrOnc.getNetworkName(properties));
+ },
+
+ /**
+ * @param {string} type
+ * @param {string=} guid
+ * @param {string=} name
+ * @private
+ */
+ showConfig_: function(type, guid, name) {
+ var params = new URLSearchParams;
+ params.append('type', type);
+ if (guid)
+ params.append('guid', guid);
+ if (name)
+ params.append('name', name);
+ settings.navigateTo(settings.Route.NETWORK_CONFIG, params);
+ },
+
+ /**
* @param {!{detail: !CrOnc.NetworkStateProperties}} event
* @private
*/
@@ -273,7 +300,10 @@ Polymer({
/** @private */
onAddWiFiTap_: function() {
- chrome.send('addNetwork', [CrOnc.Type.WI_FI]);
+ if (loadTimeData.getBoolean('networkSettingsConfig'))
+ this.showConfig_(CrOnc.Type.WI_FI);
+ else
+ chrome.send('addNetwork', [CrOnc.Type.WI_FI]);
},
/** @private */

Powered by Google App Engine
This is Rietveld 408576698