diff options
| author | stevenjb <stevenjb@chromium.org> | 2015-08-10 15:06:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-10 22:06:38 +0000 |
| commit | be74f2657e23e6ad6717c33e930c0e2c7289445e (patch) | |
| tree | f50218f7292ecc05d04bb1ee679ddc324cb44d53 /ui/chromeos | |
| parent | 365484962c8cd7f4d5d4c42dec40edf88e95bcab (diff) | |
| download | chromium_src-be74f2657e23e6ad6717c33e930c0e2c7289445e.zip chromium_src-be74f2657e23e6ad6717c33e930c0e2c7289445e.tar.gz chromium_src-be74f2657e23e6ad6717c33e930c0e2c7289445e.tar.bz2 | |
Add cr-network-select element for selecting a Chrome OS network
The purpose of this CL is to provide a network select UI for
pages other than Settings, specifically the OOBE Ui.
This CL:
* Moves cr_network_icon and cr_onc_types to cr_elements/network
* Moves cr_network_list and cr_network_list_item to cr_elements/network
* Introduces a cr_network_select wrapper to cr_elements/network
The wrapper implements the networkingPrivate calls required to
connect to a network or show the configure UI for a network.
* Adds cr_network_select to chrome://network to demonstrate it
and provide convenient access within that page while testing.
BUG=515987
Review URL: https://codereview.chromium.org/1277223002
Cr-Commit-Position: refs/heads/master@{#342705}
Diffstat (limited to 'ui/chromeos')
| -rw-r--r-- | ui/chromeos/ui_chromeos_strings.grd | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/chromeos/ui_chromeos_strings.grd b/ui/chromeos/ui_chromeos_strings.grd index 2599013..30e2353 100644 --- a/ui/chromeos/ui_chromeos_strings.grd +++ b/ui/chromeos/ui_chromeos_strings.grd @@ -199,13 +199,13 @@ <message name="IDS_ASH_STATUS_TRAY_INITIALIZING_CELLULAR" desc="Message for the status area when initializing the cellular device."> Initializing cellular modem... </message> - <message name="IDS_ASH_STATUS_TRAY_NETWORK_ACTIVATING" desc="Message for the network tray tooltip and default menu text when activating a network."> + <message name="IDS_ASH_STATUS_TRAY_NETWORK_ACTIVATING" desc="Message for the network tray tooltip and network list when activating a network."> Activating <ph name="NAME">$1<ex>YBH Cellular</ex></ph> </message> - <message name="IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED" desc="Message for the network tray tooltip and default menu text when connected to a network."> + <message name="IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED" desc="Message for the network tray tooltip and network list when connected to a network."> Connected to <ph name="NAME">$1<ex>GoogleGuest</ex></ph> </message> - <message name="IDS_ASH_STATUS_TRAY_NETWORK_CONNECTING" desc="Message for the network tray tooltip and default menu text when connecting to a network."> + <message name="IDS_ASH_STATUS_TRAY_NETWORK_CONNECTING" desc="Message for the network tray tooltip and network list when connecting to a network."> Connecting to <ph name="NAME">$1<ex>GoogleGuest</ex></ph> </message> <message name="IDS_ASH_STATUS_TRAY_NETWORK_LIST_ACTIVATE" desc="Message for the network list to activate the network."> @@ -217,7 +217,7 @@ <message name="IDS_ASH_STATUS_TRAY_NETWORK_LIST_CONNECTING" desc="Message for the network list when connecting to a network."> <ph name="NAME">$1<ex>GoogleGuest</ex></ph>: Connecting... </message> - <message name="IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED" desc="Description in status area or network dropdown when no network is connected."> + <message name="IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED" desc="Description in status area or network list when no network is connected."> No network </message> |