Cleanup network types in internet_page.js

Bug: 853953
Change-Id: Iaeebe3b1040379e9488ce9e9855ac194b215e7a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1796312Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695361}

chrome/browser/resources/settings/internet_page/BUILD.gn

@@ -28,7 +28,6 @@ js_library("internet_page") {
     "//chromeos/services/network_config/public/mojom:mojom_js_library_for_compile",
     "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider",
     "//ui/webui/resources/cr_elements/chromeos/network:cr_network_listener_behavior",
-    "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_types",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:web_ui_listener_behavior",
@@ -82,7 +81,6 @@ js_library("internet_detail_page") {
 js_library("internet_known_networks_page") {
   deps = [
     "//ui/webui/resources/cr_elements/chromeos/network:cr_network_listener_behavior",
-    "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_types",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/cr_elements/policy:cr_policy_network_behavior_mojo",
     "//ui/webui/resources/js:assert",

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

@@ -18,10 +18,10 @@ Polymer({
   properties: {
     /**
      * The type of networks to list.
-     * @type {CrOnc.Type}
+     * @type {chromeos.networkConfig.mojom.NetworkType|undefined}
      */
     networkType: {
-      type: String,
+      type: Number,
       observer: 'networkTypeChanged_',
     },
 
@@ -90,13 +90,13 @@ Polymer({
    * @private
    */
   refreshNetworks_: function() {
-    if (!this.networkType) {
+    if (this.networkType === undefined) {
       return;
     }
     const filter = {
       filter: chromeos.networkConfig.mojom.FilterType.kConfigured,
       limit: chromeos.networkConfig.mojom.kNoLimit,
-      networkType: OncMojo.getNetworkTypeFromString(this.networkType),
+      networkType: this.networkType,
     };
     this.networkConfig_.getNetworkStateList(filter).then(response => {
       this.networkStateList_ = response.result;

chrome/browser/resources/settings/internet_page/internet_page.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/mojo_interface_provider.html">
-<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
@@ -49,13 +48,12 @@
           </cr-expand-button>
           <template is="dom-if" if="[[addConnectionExpanded_]]">
             <div class="list-frame vertical-list">
-              <template is="dom-if"
-                  if="[[deviceIsEnabled_(deviceStates, 'WiFi')]]">
+              <template is="dom-if" if="[[wifiIsEnabled_(deviceStates)]]">
                 <div actionable class="list-item" on-click="onAddWiFiTap_">
                   <div class="start settings-box-text">
                     $i18n{internetAddWiFi}
                   </div>
-                  <cr-icon-button class$="[[getAddNetworkClass_('WiFi')]]"
+                  <cr-icon-button class="icon-add-wifi"
                       aria-label="$i18n{internetAddWiFi}"></cr-icon-button>
                 </div>
               </template>
@@ -63,7 +61,7 @@
                 <div class="start settings-box-text">
                   $i18n{internetAddVPN}
                 </div>
-                <cr-icon-button class$="[[getAddNetworkClass_('VPN')]]"
+                <cr-icon-button class="icon-add-circle"
                     aria-label="$i18n{internetAddVPN}"></cr-icon-button>
               </div>
               <template is="dom-repeat" items="[[vpnProviders_]]">