MD Settings: Internet: Clean up network and proxy sections.

chrome/browser/resources/settings/internet_page/network_apnlist.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Polymer element for displaying and modifying a list of cellular
  * access points.
  */
-(function() {
-'use strict';
-
 Polymer({
   is: 'network-apnlist',
 
   properties: {
     /**
      * The current set of properties for the network matching |guid|.
      * @type {!CrOnc.NetworkProperties|undefined}
      */
     networkProperties: {
       type: Object,
-      observer: 'networkPropertiesChanged_'
+      observer: 'networkPropertiesChanged_',
     },
 
     /**
      * The CrOnc.APNProperties.AccessPointName value of the selected APN.
      */
     selectedApn: {
       type: String,
-      value: ''
+      value: '',
     },
 
     /**
      * Selectable list of APN dictionaries for the UI. Includes an entry
      * corresponding to |otherApn| (see below).
      * @type {!Array<!CrOnc.APNProperties>}
      */
     apnSelectList: {
       type: Array,
-      value: function() { return []; }
+      value: function() {
+        return [];
+      }
     },
 
     /**
      * The user settable properties for a new ('other') APN. The values for
      * AccessPointName, Username, and Password will be set to the currently
      * active APN if it does not match an existing list entry.
      * @type {CrOnc.APNProperties|undefined}
      */
     otherApn: {
       type: Object,
@@ skipping 20 matching lines @@
         return {
           'AccessPointName': 'String',
           'Username': 'String',
           'Password': 'String'
         };
       },
       readOnly: true
     },
   },
 
-  /** @const */ DefaultAccessPointName: 'none',
+  /** @const */
+  DefaultAccessPointName: 'none',
 
   /**
    * Polymer networkProperties changed method.
    */
   networkPropertiesChanged_: function() {
     if (!this.networkProperties || !this.networkProperties.Cellular)
       return;
 
     /** @type {!CrOnc.APNProperties|undefined} */ var activeApn;
     var cellular = this.networkProperties.Cellular;
     /** @type {!chrome.networkingPrivate.ManagedAPNProperties|undefined} */ var
         apn = cellular.APN;
     if (apn && apn.AccessPointName) {
-      activeApn = /** @type {!CrOnc.APNProperties|undefined} */(
+      activeApn = /** @type {!CrOnc.APNProperties|undefined} */ (
           CrOnc.getSimpleActiveProperties(apn));
     } else if (cellular.LastGoodAPN && cellular.LastGoodAPN.AccessPointName) {
       activeApn = cellular.LastGoodAPN;
     }
     this.setApnSelectList_(activeApn);
   },
 
   /**
    * Sets the list of selectable APNs for the UI. Appends an 'Other' entry
    * (see comments for |otherApn| above).
    * @param {CrOnc.APNProperties|undefined} activeApn The currently active APN
    *     properties.
    * @private
    */
   setApnSelectList_: function(activeApn) {
     // Copy the list of APNs from this.networkProperties.
     var result = this.getApnList_().slice();
 
     // Test whether |activeApn| is in the current APN list in networkProperties.
-    var activeApnInList = activeApn && result.some(
-        function(a) { return a.AccessPointName == activeApn.AccessPointName; });
+    var activeApnInList = activeApn && result.some(function(a) {
+      return a.AccessPointName == activeApn.AccessPointName;
+    });
 
     // If |activeApn| is specified and not in the list, use the active
     // properties for 'other'. Otherwise use any existing 'other' properties.
     var otherApnProperties =
         (activeApn && !activeApnInList) ? activeApn : this.otherApn;
     var otherApn = this.createApnObject_(otherApnProperties);
 
     // Always use 'Other' for the name of custom APN entries (the name does
     // not get saved).
     otherApn.Name = 'Other';
 
     // If no 'active' or 'other' AccessPointName was provided, use the default.
     otherApn.AccessPointName =
         otherApn.AccessPointName || this.DefaultAccessPointName;
 
     // Save the 'other' properties.
     this.otherApn = otherApn;
 
     // Append 'other' to the end of the list of APNs.
     result.push(otherApn);
 
-    this.set('apnSelectList', result);
-    this.set(
-        'selectedApn',
-        (activeApn && activeApn.AccessPointName) || otherApn.AccessPointName);
+    this.apnSelectList = result;
+    this.selectedApn =
+        (activeApn && activeApn.AccessPointName) || otherApn.AccessPointName;
+    // We need to flush the DOM here, otherwise the paper-dropdown-menu will
+    // not update to correctly display the selected AccessPointName.
+    Polymer.dom.flush();
   },
 
   /**
    * @param {!CrOnc.APNProperties|undefined=} apnProperties
    * @return {!CrOnc.APNProperties} A new APN object with properties from
    *     |apnProperties| if provided.
    * @private
    */
   createApnObject_: function(apnProperties) {
     var newApn = {AccessPointName: ''};
@@ skipping 12 matching lines @@
       return [];
     /** @type {!chrome.networkingPrivate.ManagedAPNList|undefined} */ var
         apnlist = this.networkProperties.Cellular.APNList;
     if (!apnlist)
       return [];
     return /** @type {!Array<!CrOnc.APNProperties>} */ (
         CrOnc.getActiveValue(apnlist));
   },
 
   /**
-   * We need to update the select value after the dom-repeat template updates:
-   * 1. Rebuilding the template options resets the select value property.
-   * 2. The template update occurs after any property changed events.
-   * TODO(stevenjb): Remove once we use cr-dropdown-menu which (hopefully)
-   * won't require this.
-   * @private
-   */
-  onSelectApnUpdated_: function() {
-    this.$.selectApn.value = this.selectedApn;
-  },
-
-  /**
    * Event triggered when the selectApn selection changes.
-   * @param {Event} event The select node change event.
+   * @param {!{detail: !{selected: string}}} e
    * @private
    */
-  onSelectApnChange_: function(event) {
-    var selectedApn = event.target.value;
+  onSelectApnChange_: function(e) {
+    var selectedApn = e.detail.selected;
     // When selecting 'Other', don't set a change event unless a valid
     // non-default value has been set for Other.
     if (this.isOtherSelected_(this.networkProperties, selectedApn) &&
         (!this.otherApn || !this.otherApn.AccessPointName ||
          this.otherApn.AccessPointName == this.DefaultAccessPointName)) {
       return;
     }
     this.sendApnChange_(selectedApn);
   },
 
@@ skipping 66 matching lines @@
    * @private
    */
   findApnInList: function(apnList, accessPointName) {
     for (let a of apnList) {
       if (a.AccessPointName == accessPointName)
         return a;
     }
     return undefined;
   }
 });
-})();