Move networking components from cr-elements to cr-components.

This is a better home because these components are not generic elements, they are higher level components which directly use translated strings and contain Chrome OS networking specific logic. Moving to cr-components will also allow this code to access translated strings directly without needing to use a global CrOncStrings object which will allow us to add a11y strings without updating CrOncStrings everywhere it's defined and filled. Bug: 1023068 Change-Id: I176f6c00900a2bab3186b2b39b7be1c00d99de34 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1918031 Commit-Queue: Jon Mann <jonmann@chromium.org> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org> Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Cr-Commit-Position: refs/heads/master@{#716458}
chromium · Nov 19, 2019 · 42804a9 · 42804a9
1 parent efcdf3d
commit 42804a9
Show file tree

Hide file tree

Showing 87 changed files with 311 additions and 318 deletions.
diff --git a/ash/system/network/network_icon.cc b/ash/system/network/network_icon.cc
@@ -245,7 +245,7 @@ int StrengthIndex(int strength) {
     return kNumNetworkImages - 1;
 
   // Return an index in the range [1, kNumNetworkImages - 1].
-  // This logic is equivalent to cr_network_icon.js:strengthToIndex_().
+  // This logic is equivalent to network_icon.js:strengthToIndex_().
   int zero_based_index = (strength - 1) * (kNumNetworkImages - 1) / 100;
   return zero_based_index + 1;
 }

diff --git a/chrome/browser/chromeos/login/demo_mode/demo_setup_browsertest.cc b/chrome/browser/chromeos/login/demo_mode/demo_setup_browsertest.cc
@@ -213,7 +213,7 @@ class DemoSetupTest : public LoginManagerTest {
   bool IsCustomNetworkListElementShown(const std::string& custom_item_name) {
     const std::string element_selector = base::StrCat(
         {ScreenToContentQuery(NetworkScreenView::kScreenId),
-         ".getNetworkListItemWithQueryForTest('cr-network-list-item')"});
+         ".getNetworkListItemWithQueryForTest('network-list-item')"});
     const std::string query =
         base::StrCat({"!!", element_selector, " && ", element_selector,
                       ".item.customItemName == '", custom_item_name, "' && !",
@@ -329,7 +329,7 @@ class DemoSetupTest : public LoginManagerTest {
   }
 
   // Simulates click on the network list item. |element| should specify
-  // the aria-label of the desired cr-network-list-item.
+  // the aria-label of the desired network-list-item.
   void ClickNetworkListElement(const std::string& name) {
     const std::string query = base::StrCat(
         {ScreenToContentQuery(NetworkScreenView::kScreenId),

diff --git a/chrome/browser/chromeos/login/error_screen_browsertest.cc b/chrome/browser/chromeos/login/error_screen_browsertest.cc
@@ -99,7 +99,7 @@ class NetworkErrorScreenTest : public InProcessBrowserTest {
     return base::StrCat(
         {"$('offline-network-control').$$('#networkSelect')"
          ".getNetworkListForTest()"
-         ".querySelector('cr-network-list-item[aria-label=\"",
+         ".querySelector('network-list-item[aria-label=\"",
          wifi_network_name, "\"]')"});
   }
 

diff --git a/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.html b/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.html
@@ -8,8 +8,8 @@
 <link rel="import" href="chrome://resources/html/polymer.html">
 
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_config.html">
+<link rel="import" href="chrome://resources/cr_components/chromeos/network/network_icon.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_shared_css.html">
-<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_icon.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_page_host_style_css.html">

diff --git a/chrome/browser/resources/chromeos/internet_detail_dialog/BUILD.gn b/chrome/browser/resources/chromeos/internet_detail_dialog/BUILD.gn
@@ -25,7 +25,7 @@ js_type_check("closure_compile") {
 
 js_library("internet_detail_dialog") {
   deps = [
-    "//ui/webui/resources/cr_elements/chromeos/network:cr_network_listener_behavior",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
     "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_strings",
     "//ui/webui/resources/cr_elements/policy:cr_policy_network_behavior_mojo",
     "//ui/webui/resources/js:assert",

diff --git a/chrome/browser/resources/chromeos/internet_detail_dialog/internet_detail_dialog.html b/chrome/browser/resources/chromeos/internet_detail_dialog/internet_detail_dialog.html
@@ -10,14 +10,14 @@
 
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_apnlist.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_choose_mobile.html">
+<link rel="import" href="chrome://resources/cr_components/chromeos/network/network_icon.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_ip_config.html">
+<link rel="import" href="chrome://resources/cr_components/chromeos/network/network_listener_behavior.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_nameservers.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_property_list_mojo.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_proxy.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_shared_css.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_siminfo.html">
-<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_listener_behavior.html">
-<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_icon.html">
 <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_strings.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_page_host_style_css.html">
@@ -97,10 +97,10 @@
     <!-- Title section: Icon + name + connection state. -->
     <div id="title" class="section first">
       <div class="start layout horizontal center">
-        <cr-network-icon
+        <network-icon
             show-technology-badge="[[showTechnologyBadge_]]"
             network-state="[[getNetworkState_(managedProperties_)]]">
-        </cr-network-icon>
+        </network-icon>
         <div id="networkName" class="title">
           [[getNameText_(managedProperties_)]]
         </div>

diff --git a/chrome/browser/resources/chromeos/internet_detail_dialog/internet_detail_dialog.js b/chrome/browser/resources/chromeos/internet_detail_dialog/internet_detail_dialog.js
@@ -14,7 +14,7 @@ Polymer({
   is: 'internet-detail-dialog',
 
   behaviors: [
-    CrNetworkListenerBehavior,
+    NetworkListenerBehavior,
     CrPolicyNetworkBehaviorMojo,
     I18nBehavior,
   ],

diff --git a/chrome/browser/resources/chromeos/login/BUILD.gn b/chrome/browser/resources/chromeos/login/BUILD.gn
@@ -242,7 +242,7 @@ js_library("navigation_bar") {
 
 js_library("network_select_login") {
   deps = [
-    "//ui/webui/resources/cr_elements/chromeos/network:cr_network_select",
+    "//ui/webui/resources/cr_components/chromeos/network:network_select",
     "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_strings",
     "//ui/webui/resources/js/chromeos:onc_mojo",
   ]

diff --git a/chrome/browser/resources/chromeos/login/network_select_login.html b/chrome/browser/resources/chromeos/login/network_select_login.html
@@ -1,5 +1,5 @@
 <link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_select.html">
+<link rel="import" href="chrome://resources/cr_components/chromeos/network/network_select.html">
 <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_strings.html">
 <link rel="import" href="chrome://resources/html/chromeos/onc_mojo.html">
 
@@ -15,7 +15,7 @@
     }
   </style>
   <template>
-    <cr-network-select id="networkSelect" class="focus-on-show"
+    <network-select id="networkSelect" class="focus-on-show"
         show-scan-progress
         custom-items="[[getNetworkCustomItems_(isConnected)]]"
         on-default-network-changed="onDefaultNetworkChanged_"
@@ -25,6 +25,6 @@
         on-custom-item-selected="onNetworkListCustomItemSelected_"
         no-bottom-scroll-border="[[noBottomScrollBorder]]"
         show-technology-badge="[[showTechnologyBadge_]]">
-    </cr-network-select>
+    </network-select>
   </template>
 </dom-module>
diff --git a/chrome/browser/resources/chromeos/login/network_select_login.js b/chrome/browser/resources/chromeos/login/network_select_login.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 /**
- * @fileoverview Polymer element wrapping cr-network-select for login/oobe.
+ * @fileoverview Polymer element wrapping network-select for login/oobe.
  */
 
 {
@@ -84,7 +84,7 @@
 
     /** Refreshes the list of the networks. */
     refresh: function() {
-      /** @type {!CrNetworkSelectElement} */ (this.$.networkSelect)
+      /** @type {!NetworkSelectElement} */ (this.$.networkSelect)
           .refreshNetworks();
       this.networkLastSelectedGuid_ = '';
     },
@@ -105,9 +105,9 @@
     },
 
     /**
-     * Call after strings are loaded to set CrOncStrings for cr-network-select.
+     * Call after strings are loaded to set CrOncStrings for network-select.
      */
-    setCrOncStrings: function() {
+    setOncStrings: function() {
       CrOncStrings = {
         OncTypeCellular: loadTimeData.getString('OncTypeCellular'),
         OncTypeEthernet: loadTimeData.getString('OncTypeEthernet'),
@@ -237,7 +237,7 @@
     },
 
     /**
-     * Event triggered when a cr-network-list-item connection state changes.
+     * Event triggered when a network-list-item connection state changes.
      * @param {!CustomEvent<!OncMojo.NetworkStateProperties>} event
      * @private
      */

diff --git a/chrome/browser/resources/chromeos/login/oobe_network.js b/chrome/browser/resources/chromeos/login/oobe_network.js
@@ -81,15 +81,15 @@ Polymer({
 
   /** Updates localized elements of the UI. */
   updateLocalizedContent: function() {
-    this.$.networkSelectLogin.setCrOncStrings();
+    this.$.networkSelectLogin.setOncStrings();
     this.i18nUpdateLocale();
   },
 
   /**
    * Returns element of the network list selected by the query.
    * Used to simplify testing.
    * @param {string} query
-   * @return {CrNetworkList.CrNetworkListItemType}
+   * @return {NetworkList.NetworkListItemType}
    */
   getNetworkListItemWithQueryForTest: function(query) {
     let networkList =
@@ -102,14 +102,14 @@ Polymer({
    * Returns element of the network list with the given name.
    * Used to simplify testing.
    * @param {string} name
-   * @return {?CrNetworkList.CrNetworkListItemType}
+   * @return {?NetworkList.NetworkListItemType}
    */
   getNetworkListItemByNameForTest: function(name) {
     let networkList =
         this.$.networkSelectLogin.$$('#networkSelect').getNetworkListForTest();
     assert(networkList);
     for (const network of networkList.children) {
-      if (network.is === 'cr-network-list-item' &&
+      if (network.is === 'network-list-item' &&
           network.$$('#divText').children[0].innerText === name) {
         return network;
       }

diff --git a/chrome/browser/resources/chromeos/login/screen_error_message.js b/chrome/browser/resources/chromeos/login/screen_error_message.js
@@ -242,7 +242,7 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
       $('connecting-indicator').innerHTML =
           loadTimeData.getStringF('connectingIndicatorText', ellipsis);
 
-      $('offline-network-control').setCrOncStrings();
+      $('offline-network-control').setOncStrings();
 
       this.onContentChange_();
     },

diff --git a/chrome/browser/resources/chromeos/network_ui/BUILD.gn b/chrome/browser/resources/chromeos/network_ui/BUILD.gn
@@ -14,7 +14,7 @@ js_library("network_ui") {
   deps = [
     "//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_icon",
+    "//ui/webui/resources/cr_components/chromeos/network:network_icon",
     "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_strings",
     "//ui/webui/resources/js:load_time_data",
     "//ui/webui/resources/js:util",

diff --git a/chrome/browser/resources/chromeos/network_ui/network_ui.css b/chrome/browser/resources/chromeos/network_ui/network_ui.css
@@ -58,6 +58,6 @@ div {
   width: 32px;
 }
 
-cr-network-select {
+network-select {
   flex: 1;
 }
diff --git a/chrome/browser/resources/chromeos/network_ui/network_ui.html b/chrome/browser/resources/chromeos/network_ui/network_ui.html
@@ -7,8 +7,8 @@
   <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
   <link rel="stylesheet" href="chrome://network/network_ui.css">
   <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_network_icon.html">
-  <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_select.html">
+  <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_icon.html">
+  <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_select.html">
   <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_strings.html">
   <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
 
@@ -47,9 +47,8 @@ <h2>$i18n{addNewWifiLabel}</h2>
   <h2>$i18n{globalPolicyLabel}</h2>
   <div id="global-policy"></div>
 
-  <h2>CrNetworkSelect</h2>
   <div id="select-div">
-    <cr-network-select></cr-network-select>
+    <network-select></network-select>
   </div>
   <div>
     <cr-button class="action-button" id="refresh">

diff --git a/chrome/browser/resources/chromeos/network_ui/network_ui.js b/chrome/browser/resources/chromeos/network_ui/network_ui.js
@@ -162,8 +162,8 @@ const NetworkUI = (function() {
   const createStateTableIcon = function(state) {
     const cell = createTableCellElement();
     cell.className = 'state-table-icon-cell';
-    const icon = /** @type {!CrNetworkIconElement} */ (
-        document.createElement('cr-network-icon'));
+    const icon = /** @type {!NetworkIconElement} */ (
+        document.createElement('network-icon'));
     icon.isListItem = true;
     icon.networkState = OncMojo.getDefaultNetworkState(state.type);
     cell.appendChild(icon);
@@ -569,7 +569,7 @@ const NetworkUI = (function() {
   };
 
   /**
-   * Handles clicks on network items in the <cr-network-select> element by
+   * Handles clicks on network items in the <network-select> element by
    * attempting a connection to the selected network or requesting a password
    * if the network requires a password.
    * @param {!Event<!OncMojo.NetworkStateProperties>} event
@@ -605,7 +605,7 @@ const NetworkUI = (function() {
    * Gets network information from WebUI and sets custom items.
    */
   document.addEventListener('DOMContentLoaded', function() {
-    const select = document.querySelector('cr-network-select');
+    const select = document.querySelector('network-select');
     select.customItems = [
       {customItemName: 'Add WiFi', polymerIcon: 'cr:add', customData: 'WiFi'},
       {customItemName: 'Add VPN', polymerIcon: 'cr:add', customData: 'VPN'}

diff --git a/chrome/browser/resources/settings/internet_page/BUILD.gn b/chrome/browser/resources/settings/internet_page/BUILD.gn
@@ -27,7 +27,7 @@ js_library("internet_page") {
     "../settings_page:settings_animated_pages",
     "//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_components/chromeos/network:network_listener_behavior",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:web_ui_listener_behavior",
@@ -64,7 +64,7 @@ js_library("internet_detail_page") {
     ":internet_page_browser_proxy",
     ":tether_connection_dialog",
     "..:route",
-    "//ui/webui/resources/cr_elements/chromeos/network:cr_network_listener_behavior",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
     "//ui/webui/resources/cr_elements/policy:cr_policy_network_behavior_mojo",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:i18n_behavior",
@@ -78,7 +78,7 @@ 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_components/chromeos/network:network_listener_behavior",
     "//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",
@@ -91,7 +91,7 @@ js_library("internet_subpage") {
   deps = [
     ":internet_page_browser_proxy",
     "..:route",
-    "//ui/webui/resources/cr_elements/chromeos/network:cr_network_listener_behavior",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
     "//ui/webui/resources/cr_elements/policy:cr_policy_network_behavior_mojo",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:i18n_behavior",
@@ -117,7 +117,7 @@ js_library("network_proxy_section") {
 
 js_library("network_summary") {
   deps = [
-    "//ui/webui/resources/cr_elements/chromeos/network:cr_network_listener_behavior",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js/chromeos:onc_mojo",
   ]

diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.html b/chrome/browser/resources/settings/internet_page/internet_detail_page.html
@@ -2,12 +2,12 @@
 
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_apnlist.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_choose_mobile.html">
+<link rel="import" href="chrome://resources/cr_components/chromeos/network/network_icon.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_ip_config.html">
+<link rel="import" href="chrome://resources/cr_components/chromeos/network/network_listener_behavior.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_nameservers.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_property_list_mojo.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_siminfo.html">
-<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_icon.html">
-<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_listener_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.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_toggle/cr_toggle.html">
@@ -76,10 +76,10 @@
     <!-- Title section: Icon + name + connection state. -->
     <div id="titleDiv" class="settings-box first">
       <div class="start layout horizontal center">
-        <cr-network-icon
+        <network-icon
             show-technology-badge="[[showTechnologyBadge_]]"
             network-state="[[getNetworkState_(managedProperties_)]]">
-        </cr-network-icon>
+        </network-icon>
         <div id="networkState" class="title settings-box-text"
             connected$="[[isConnectedState_(managedProperties_)]]"
             error$="[[isConnectionErrorState_(

diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.js b/chrome/browser/resources/settings/internet_page/internet_detail_page.js
@@ -16,7 +16,7 @@ Polymer({
   is: 'settings-internet-detail-page',
 
   behaviors: [
-    CrNetworkListenerBehavior,
+    NetworkListenerBehavior,
     CrPolicyNetworkBehaviorMojo,
     settings.RouteObserverBehavior,
     I18nBehavior,

diff --git a/chrome/browser/resources/settings/internet_page/internet_known_networks_page.html b/chrome/browser/resources/settings/internet_page/internet_known_networks_page.html
@@ -1,6 +1,6 @@
 <link rel="import" href="chrome://resources/html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_listener_behavior.html">
+<link rel="import" href="chrome://resources/cr_components/chromeos/network/network_listener_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action_menu.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html">

diff --git a/chrome/browser/resources/settings/internet_page/internet_known_networks_page.js b/chrome/browser/resources/settings/internet_page/internet_known_networks_page.js
@@ -11,7 +11,7 @@ Polymer({
   is: 'settings-internet-known-networks-page',
 
   behaviors: [
-    CrNetworkListenerBehavior,
+    NetworkListenerBehavior,
     CrPolicyNetworkBehaviorMojo,
   ],
 

diff --git a/chrome/browser/resources/settings/internet_page/internet_page.html b/chrome/browser/resources/settings/internet_page/internet_page.html
@@ -1,7 +1,7 @@
 <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_network_listener_behavior.html">
+<link rel="import" href="chrome://resources/cr_components/chromeos/network/network_listener_behavior.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">