| 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 2023e3b349853b7214549a3a8b9e3dc7a8931322..db30ea47325587985d219e29a6c2840045ef741d 100644
|
| --- a/chrome/browser/resources/settings/internet_page/internet_detail_page.js
|
| +++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.js
|
| @@ -131,8 +131,8 @@ Polymer({
|
| ETHERNET: CrOnc.Type.ETHERNET,
|
| TETHER: CrOnc.Type.TETHER,
|
| VPN: CrOnc.Type.VPN,
|
| - WIFI: CrOnc.Type.WI_FI,
|
| - WIMAX: CrOnc.Type.WI_MAX,
|
| + WI_FI: CrOnc.Type.WI_FI,
|
| + WI_MAX: CrOnc.Type.WI_MAX,
|
| },
|
| readOnly: true
|
| },
|
| @@ -190,10 +190,9 @@ Polymer({
|
|
|
| /** @private */
|
| close_: function() {
|
| - // Delay navigating until the next render frame to allow other subpages to
|
| - // load first.
|
| - setTimeout(function() {
|
| - settings.navigateTo(settings.Route.INTERNET);
|
| + // Delay navigating to allow other subpages to load first.
|
| + requestAnimationFrame(function() {
|
| + settings.navigateToPreviousRoute();
|
| });
|
| },
|
|
|
| @@ -278,7 +277,7 @@ Polymer({
|
|
|
| /**
|
| * networkingPrivate.getProperties callback.
|
| - * @param {CrOnc.NetworkProperties} properties The network properties.
|
| + * @param {!CrOnc.NetworkProperties} properties The network properties.
|
| * @private
|
| */
|
| getPropertiesCallback_: function(properties) {
|
| @@ -555,7 +554,10 @@ Polymer({
|
|
|
| /** @private */
|
| onConfigureTap_: function() {
|
| - chrome.send('configureNetwork', [this.guid]);
|
| + if (loadTimeData.getBoolean('networkSettingsConfig'))
|
| + this.fire('show-config', this.networkProperties);
|
| + else
|
| + chrome.send('configureNetwork', [this.guid]);
|
| },
|
|
|
| /** @private */
|
|
|