diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 22:43:24 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 22:43:24 +0000 |
| commit | ce98ef850907de1eacd6d012e2b6a4f9b3274884 (patch) | |
| tree | d644056ac28554499a9190e18787266e24ab9d23 /ash/ash_chromeos_strings.grdp | |
| parent | 227692c5deb033cd21a89573b4b16ca20a345811 (diff) | |
| download | chromium_src-ce98ef850907de1eacd6d012e2b6a4f9b3274884.zip chromium_src-ce98ef850907de1eacd6d012e2b6a4f9b3274884.tar.gz chromium_src-ce98ef850907de1eacd6d012e2b6a4f9b3274884.tar.bz2 | |
Trigger NetworkConnectionHandler callbacks on success or failure
This CL triggers waits for the network state to change before triggering
success or failure callbacks in NetworkConnectionHandler.
Notifications are triggered on success or failure without requiring the
NetworkStateHandler connecting_network() hack.
It also separates the enable flag from NetworkConfigurationHandler since
enabling that has different artifacts.
BUG=243899
For ash.gyp:
TBR=gspencer@chromium.org
Review URL: https://codereview.chromium.org/16123011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_chromeos_strings.grdp')
| -rw-r--r-- | ash/ash_chromeos_strings.grdp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/ash_chromeos_strings.grdp b/ash/ash_chromeos_strings.grdp index 7ecee26..ba59e49 100644 --- a/ash/ash_chromeos_strings.grdp +++ b/ash/ash_chromeos_strings.grdp @@ -117,6 +117,10 @@ <message name="IDS_NETWORK_CONNECTION_ERROR_MESSAGE_WITH_DETAILS" desc="Message for network connection error notification with details"> Failed to connect to network '<ph name="name">$1<ex>GoogleGuest</ex></ph>': <ph name="details">$2<ex>Unrecognized error</ex></ph> </message> + <message name="IDS_NETWORK_CONNECTION_ERROR_MESSAGE_WITH_SERVER_MESSAGE" desc="Message for network connection error notification with details and a server message"> +Failed to connect to '<ph name="name">$1<ex>GoogleGuest</ex></ph>': <ph name="details">$2<ex>Unrecognized error</ex></ph> +Server message: <ph name="server_msg">$3<ex>Incorrect password</ex></ph> + </message> <message name="IDS_NETWORK_OUT_OF_CREDITS_TITLE" desc="Title for network out of data error notification"> Network Connection Error </message> |