network-ui: move ONC UI strings to //chromeos

The network ONC strings are used both in //chrome and //chromeos.
Strings that are required in both locations need to be moved to
//chromeos to prevent a layering violation. Screenshots are added in
this change as they were not required when these strings were
originally added.

Bug: chromium:1159069
Change-Id: Id2615e0b42b11c88ac3170fc7734cb8f817d0831
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2606632Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Trent Begin <tbegin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840346}

chrome/app/chromeos_strings.grdp

@@ -1689,18 +1689,6 @@
 
   <!-- Open Network (ONC)-->
   <!-- TODO(crbug.com/1142857) Move these strings to //chromeos/components/network_ui -->
-  <message name="IDS_ONC_IPV4_ADDRESS" desc="ONC Property label for ipv4-IPAddress">
-    IP address
-  </message>
-  <message name="IDS_ONC_IPV4_GATEWAY" desc="ONC Property label for ipv4-Gateway">
-    Gateway
-  </message>
-  <message name="IDS_ONC_IPV4_NETMASK" desc="ONC Property label for ipv4-netmask">
-    Subnet mask
-  </message>
-  <message name="IDS_ONC_IPV6_ADDRESS" desc="ONC Property label for ipv6-Address">
-    IPv6 address
-  </message>
   <message name="IDS_ONC_CELLULAR_ACTIVATION_STATE" desc="ONC Property label for Cellular.ActivationState">
     Activation status
   </message>
@@ -1776,12 +1764,6 @@
   <message name="IDS_ONC_CELLULAR_SERVING_OPERATOR_NAME" desc="ONC Property label for Cellular.ServingOperator.Name">
     Operator
   </message>
-  <message name="IDS_ONC_CONNECTED" desc="Settings > Internet, text in network summary when a network is connected.">
-    Connected
-  </message>
-  <message name="IDS_ONC_CONNECTING" desc="Settings > Internet, text in network summary when a network is connecting.">
-    Connecting
-  </message>
   <message name="IDS_ONC_EAP_ANONYMOUS_IDENTITY" desc="ONC Property label for EAP.AnonymousIdentity">
     Anonymous Identity
   </message>
@@ -1839,21 +1821,6 @@
   <message name="IDS_ONC_NOT_CONNECTED" desc="Settings > Internet, text in network summary when a network is not connecting or connected.">
     Not Connected
   </message>
-  <message name="IDS_ONC_PORTAL_STATE" desc="Settings > Internet, label in network details page for the captive portal state.">
-    Portal State
-  </message>
-  <message name="IDS_ONC_PORTAL_STATE_NO_INTERNET" desc="Settings > Internet, text in network details page when no internet connection is avialable.">
-    No internet
-  </message>
-  <message name="IDS_ONC_PORTAL_STATE_PORTAL" desc="Settings > Internet, text in network details page when a portal state was detected.">
-    Captive portal detected
-  </message>
-  <message name="IDS_ONC_PORTAL_STATE_PORTAL_SUSPECTED" desc="Settings > Internet, text in network details page when a portal state is suspected.">
-    Captive portal suspected
-  </message>
-  <message name="IDS_ONC_PORTAL_STATE_PROXY_AUTH" desc="Settings > Internet, text in network details page when a portal state was detected.">
-    Proxy authentication required
-  </message>
   <message name="IDS_ONC_TETHER_BATTERY_PERCENTAGE" desc="Settings > Internet > Title of section which displays the battery percentage of another device which provides a tether hotspot for the current device to connect to.">
     Battery
   </message>
@@ -1884,75 +1851,6 @@
   <message name="IDS_ONC_TETHER_CARRIER_UNKNOWN" desc="Settings > Internet > Text displayed in the settings UI in place of a cellular provider when the actual name of the provider is unknown. In this context, the cellular provider refers to the carrier which provides mobile data service to another device which can start a tether hotspot to provide a data connection to the current device.">
     Unknown carrier
   </message>
-  <message name="IDS_ONC_VPN_HOST" desc="ONC Property label for VPN.Host">
-    Server hostname
-  </message>
-  <message name="IDS_ONC_VPN_IPSEC_GROUP" desc="ONC Property label for VPN.IPSec.Group">
-    Group name
-  </message>
-  <message name="IDS_ONC_VPN_IPSEC_PSK" desc="ONC Property label for VPN.IPSec.PSK">
-    Pre-shared key
-  </message>
-  <message name="IDS_ONC_VPN_OPENVPN_EXTRA_HOSTS" desc="ONC Property label for VPN.OpenVPN.ExtraHosts">
-    Extra hosts
-  </message>
-  <message name="IDS_ONC_VPN_OPENVPN_OTP" desc="ONC Property label for VPN.OpenVPN.OTP">
-    OTP
-  </message>
-  <message name="IDS_ONC_VPN_PASSWORD" desc="ONC Property label for VPN.OpenVPN.Password or VPN.L2TP.Password">
-    Password
-  </message>
-  <message name="IDS_ONC_VPN_USERNAME" desc="ONC Property label for VPN.OpenVPN.Username or VPN.L2TP.Username">
-    Username
-  </message>
-  <message name="IDS_ONC_VPN_THIRD_PARTY_VPN_PROVIDER_NAME" desc="ONC Property label for VPN.ThirdPartyVPN.ProviderName">
-    Provider name
-  </message>
-  <message name="IDS_ONC_VPN_TYPE" desc="ONC Property label for VPN.Type">
-    Provider type
-  </message>
-  <message name="IDS_ONC_VPN_TYPE_L2TP_IPSEC" desc="ONC Property label for VPN.Type.L2TP-IPSec">
-    L2TP/IPsec
-  </message>
-  <message name="IDS_ONC_VPN_TYPE_L2TP_IPSEC_PSK" desc="ONC Property label for configuring VPN.Type.L2TP-IPSec with AuthenticationType = PSK">
-    L2TP/IPsec + pre-shared key
-  </message>
-  <message name="IDS_ONC_VPN_TYPE_L2TP_IPSEC_CERT" desc="ONC Property label for configuring VPN.Type.L2TP-IPSec  with AuthenticationType = Cert">
-    L2TP/IPsec + user certificate
-  </message>
-  <message name="IDS_ONC_VPN_TYPE_OPENVPN" desc="ONC Property label for VPN.Type.OpenVPN">
-    Open VPN
-  </message>
-  <message name="IDS_ONC_VPN_TYPE_ARCVPN" desc="ONC Property label for VPN.Type.ARCVPN">
-    Android VPN
-  </message>
-  <message name="IDS_ONC_WIFI_FREQUENCY" desc="ONC Property label for WiFi.Frequency">
-    Frequency
-  </message>
-  <message name="IDS_ONC_WIFI_PASSWORD" desc="ONC Property label for WiFi.Password">
-    Password
-  </message>
-  <message name="IDS_ONC_WIFI_SECURITY" desc="ONC Property label for WiFi.Security">
-    Security
-  </message>
-  <message name="IDS_ONC_WIFI_SECURITY_NONE" desc="In settings > Internet, a string specifying security type = none.">
-    None
-  </message>
-  <message name="IDS_ONC_WIFI_SECURITY_WEP" desc="In settings > Internet, a string specifying security type = WEP.">
-    WEP
-  </message>
-  <message name="IDS_ONC_WIFI_SECURITY_PSK" desc="In settings > Internet, a string specifying security type = PSK (either WPA-PSK or RSN-PSK).">
-    PSK (WPA or RSN)
-  </message>
-  <message name="IDS_ONC_WIFI_SECURITY_EAP" desc="In settings > Internet, a string specifying security type = EAP (802.1X).">
-    EAP
-  </message>
-  <message name="IDS_ONC_WIFI_SSID" desc="ONC Property label for WiFi.SSID">
-    SSID
-  </message>
-  <message name="IDS_ONC_WIFI_BSSID" desc="Settings > Network > Wifi Network Detail Page > label for BSSID property. BSSID is a a unique 48 bit identifier for a wireless access point.">
-    BSSID
-  </message>
 
   <!-- Settings Internet Page-->
   <message name="IDS_SETTINGS_INTERNET_CONFIG" desc="Title for the network configuration dialog.">

chromeos/chromeos_strings.grd

@@ -833,6 +833,109 @@ Try tapping the mic to ask me anything.
       <message name="IDS_ONC_WIFI_SIGNAL_STRENGTH" desc="ONC Property label for WiFi.SignalStrength">
         Signal strength
       </message>
+      <message name="IDS_ONC_IPV4_ADDRESS" desc="ONC Property label for ipv4-IPAddress">
+        IP address
+      </message>
+      <message name="IDS_ONC_IPV4_GATEWAY" desc="ONC Property label for ipv4-Gateway">
+        Gateway
+      </message>
+      <message name="IDS_ONC_IPV4_NETMASK" desc="ONC Property label for ipv4-netmask">
+        Subnet mask
+      </message>
+      <message name="IDS_ONC_IPV6_ADDRESS" desc="ONC Property label for ipv6-Address">
+        IPv6 address
+      </message>
+      <message name="IDS_ONC_CONNECTED" desc="Settings > Internet, text in network summary when a network is connected.">
+        Connected
+      </message>
+      <message name="IDS_ONC_CONNECTING" desc="Settings > Internet, text in network summary when a network is connecting.">
+        Connecting
+      </message>
+      <message name="IDS_ONC_PORTAL_STATE" desc="Settings > Internet, label in network details page for the captive portal state.">
+        Portal State
+      </message>
+      <message name="IDS_ONC_PORTAL_STATE_NO_INTERNET" desc="Settings > Internet, text in network details page when no internet connection is avialable.">
+        No internet
+      </message>
+      <message name="IDS_ONC_PORTAL_STATE_PORTAL" desc="Settings > Internet, text in network details page when a portal state was detected.">
+        Captive portal detected
+      </message>
+      <message name="IDS_ONC_PORTAL_STATE_PORTAL_SUSPECTED" desc="Settings > Internet, text in network details page when a portal state is suspected.">
+        Captive portal suspected
+      </message>
+      <message name="IDS_ONC_PORTAL_STATE_PROXY_AUTH" desc="Settings > Internet, text in network details page when a portal state was detected.">
+        Proxy authentication required
+      </message>
+      <message name="IDS_ONC_WIFI_FREQUENCY" desc="ONC Property label for WiFi.Frequency">
+        Frequency
+      </message>
+      <message name="IDS_ONC_WIFI_PASSWORD" desc="ONC Property label for WiFi.Password">
+        Password
+      </message>
+      <message name="IDS_ONC_WIFI_SECURITY" desc="ONC Property label for WiFi.Security">
+        Security
+      </message>
+      <message name="IDS_ONC_WIFI_SECURITY_NONE" desc="In settings > Internet, a string specifying security type = none.">
+        None
+      </message>
+      <message name="IDS_ONC_WIFI_SECURITY_PSK" desc="In settings > Internet, a string specifying security type = PSK (either WPA-PSK or RSN-PSK).">
+        PSK (WPA or RSN)
+      </message>
+      <message name="IDS_ONC_WIFI_SECURITY_WEP" desc="In settings > Internet, a string specifying security type = WEP.">
+        WEP
+      </message>
+      <message name="IDS_ONC_WIFI_SECURITY_EAP" desc="In settings > Internet, a string specifying security type = EAP (802.1X).">
+        EAP
+      </message>
+      <message name="IDS_ONC_WIFI_SSID" desc="ONC Property label for WiFi.SSID">
+        SSID
+      </message>
+      <message name="IDS_ONC_WIFI_BSSID" desc="Settings > Network > Wifi Network Detail Page > label for BSSID property. BSSID is a a unique 48 bit identifier for a wireless access point.">
+        BSSID
+      </message>
+      <message name="IDS_ONC_VPN_HOST" desc="ONC Property label for VPN.Host">
+        Server hostname
+      </message>
+      <message name="IDS_ONC_VPN_TYPE" desc="ONC Property label for VPN.Type">
+        Provider type
+      </message>
+      <message name="IDS_ONC_VPN_IPSEC_GROUP" desc="ONC Property label for VPN.IPSec.Group">
+        Group name
+      </message>
+      <message name="IDS_ONC_VPN_THIRD_PARTY_VPN_PROVIDER_NAME" desc="ONC Property label for VPN.ThirdPartyVPN.ProviderName">
+        Provider name
+      </message>
+      <message name="IDS_ONC_VPN_OPENVPN_OTP" desc="ONC Property label for VPN.OpenVPN.OTP">
+        OTP
+      </message>
+      <message name="IDS_ONC_VPN_TYPE_L2TP_IPSEC" desc="ONC Property label for VPN.Type.L2TP-IPSec">
+        L2TP/IPsec
+      </message>
+      <message name="IDS_ONC_VPN_TYPE_L2TP_IPSEC_PSK" desc="ONC Property label for configuring VPN.Type.L2TP-IPSec with AuthenticationType = PSK">
+        L2TP/IPsec + pre-shared key
+      </message>
+      <message name="IDS_ONC_VPN_TYPE_L2TP_IPSEC_CERT" desc="ONC Property label for configuring VPN.Type.L2TP-IPSec  with AuthenticationType = Cert">
+        L2TP/IPsec + user certificate
+      </message>
+      <message name="IDS_ONC_VPN_OPENVPN_EXTRA_HOSTS" desc="ONC Property label for VPN.OpenVPN.ExtraHosts">
+        Extra hosts
+      </message>
+      <message name="IDS_ONC_VPN_IPSEC_PSK" desc="ONC Property label for VPN.IPSec.PSK">
+        Pre-shared key
+      </message>
+      <message name="IDS_ONC_VPN_PASSWORD" desc="ONC Property label for VPN.OpenVPN.Password or VPN.L2TP.Password">
+        Password
+      </message>
+      <message name="IDS_ONC_VPN_USERNAME" desc="ONC Property label for VPN.OpenVPN.Username or VPN.L2TP.Username">
+        Username
+      </message>
+      <message name="IDS_ONC_VPN_TYPE_OPENVPN" desc="ONC Property label for VPN.Type.OpenVPN">
+        Open VPN
+      </message>
+      <message name="IDS_ONC_VPN_TYPE_ARCVPN" desc="ONC Property label for VPN.Type.ARCVPN">
+        Android VPN
+      </message>
+
 
       <!-- Network Health display strings -->
       <message name="IDS_NETWORK_HEALTH_STATE" desc="Label for the current state of a networking device.">

chromeos/chromeos_strings_grd/IDS_ONC_CONNECTED.png.sha1

+9c5b6ba63aef9bb443deaac9b09429a506e8dd1a
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_CONNECTING.png.sha1

+f46694f24e422c4f45784ce98da9868f86da3528
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_IPV4_ADDRESS.png.sha1

+30efdc1d968bda9824b21dd7132dfe6a271a8c23
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_IPV4_GATEWAY.png.sha1

+bb5a63541fc15a7ecb9fcf8b0817d76174c62309
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_IPV6_ADDRESS.png.sha1

+e26763abecb597cc9ea6d739ac4f7cccbb58b29c
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_HOST.png.sha1

+fa18ad4b7baa16e22d7a81cde3b22ff1c8f0166f
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_IPSEC_GROUP.png.sha1

+6de09410619eb9a7abb3613c406508200b7d2dcc
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_IPSEC_PSK.png.sha1

+cb5c90b2d95d9e78d8e3fc2ad43412b8a6ebd270
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_OPENVPN_EXTRA_HOSTS.png.sha1

+d0c7df0acea052164137df30e5a18e1da9be5cd2
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_OPENVPN_OTP.png.sha1

+723a8bcb7bdf554d431b6735d6bd81ed8fae95a7
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_PASSWORD.png.sha1

+de376446f14f8c15f53076e2f4a42423b95aa4cb
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_THIRD_PARTY_VPN_PROVIDER_NAME.png.sha1

+fe150b3938b8319b5479b415175b31d4f22a0ca7
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_TYPE.png.sha1

+5daa6bf468d7011dc92e3f88c7df5220f6302f4a
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_TYPE_ARCVPN.png.sha1

+64e5469d2fc1c23bca9f21ca94e170d80dbb060b
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_TYPE_L2TP_IPSEC.png.sha1

+df10ded726fbd38887385d3ddc394bebb28543da
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_TYPE_L2TP_IPSEC_CERT.png.sha1

+c8c41ff1427632a2e3461cd89efa31c4894931c0
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_TYPE_L2TP_IPSEC_PSK.png.sha1

+a73c436c0bad8612779c8aa56f6bf4ac5ac4a08d
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_TYPE_OPENVPN.png.sha1

+eaf73683e5099e0cc5d4ca663ad624a349135114
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_VPN_USERNAME.png.sha1

+ac18b260b4688fc0532627485047f45328659072
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_WIFI_FREQUENCY.png.sha1

+61306422288bdb3862be144b5847a95cdc28116c
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_WIFI_PASSWORD.png.sha1

+ab412c718b5749d21e1e291445052c1207b0e317
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_WIFI_SECURITY.png.sha1

+f490201d829dd34f136992b4a4fdf6e1966aa254
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_WIFI_SECURITY_EAP.png.sha1

+081835e5bd8b9de21213e45e288899d2fefdcd37
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_WIFI_SECURITY_NONE.png.sha1

+0f1e470ee1c6cc0b2a151b46ba2d24804adbbc12
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_WIFI_SECURITY_PSK.png.sha1

+f0772f8884c4484df72317941b334adcfbaacf7e
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_WIFI_SECURITY_WEP.png.sha1

+fef07a4064a30df7441250318e47cd126d129ae1
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ONC_WIFI_SSID.png.sha1

+2270208ad4ed98f319fdaf80e11d64401b78926b
\ No newline at end of file