From 35b423a8e761e5f7f94618ad6484933c3614a409 Mon Sep 17 00:00:00 2001
From: "jamiewalch@chromium.org"
 <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 2 Mar 2013 17:14:52 +0000
Subject: Improve host-list display in case of auth or network error.

There were a couple of underlying problems:

1. The user-visible string for NETWORK_FAILED was very host specific. I changed
it to be more generic and added a new NAT_TRAVERSAL_DISABLED error for that
case. Note that there may be non-NAT-related situations that would cause the
same error condition, so it's not 100% accurate. I've also gotten rid of the
NO_RESPONSE error, which was serving the same purpose as NETWORK_FAILED, but
with less helpful language.

2. The cached host-list was being cleared in case of errors, so the web-app
was unable to display the name of the local host.

BUG=175241


Review URL: https://chromiumcodereview.appspot.com/12374053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185716 0039d316-1c4b-4281-b951-d872f2087c98
---
 remoting/resources/remoting_strings.grd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'remoting/resources')

diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd
index 7bb12ed..04e6e73 100644
--- a/remoting/resources/remoting_strings.grd
+++ b/remoting/resources/remoting_strings.grd
@@ -330,11 +330,11 @@
       <message desc="Error displayed if an invalid access code is entered." name="IDR_ERROR_INVALID_ACCESS_CODE">
         The access code is invalid. Please try again.
       </message>
-      <message desc="Error displayed when the host is online, but we are unable to connect to it due to network configuration." name="IDR_ERROR_NETWORK_FAILURE">
+      <message desc="Error displayed when the host is online, but we are unable to connect to it due to network configuration." name="IDR_ERROR_P2P_FAILURE">
         Unable to reach the host. This is probably due to the configuration of the network you are using.
       </message>
-      <message desc="Error displayed by the client if the server does not respond to a network request." name="IDR_ERROR_NO_RESPONSE">
-        The server failed to respond to the network request.
+      <message desc="Error displayed when the host is online, but we are unable to connect to it due to network configuration." name="IDR_ERROR_NETWORK_FAILURE">
+        Could not connect to the network. Please check that your device is on-line.
       </message>
       <message desc="Error displayed when the service returns a 503 error. Such errors are usually temporary, and resolve themselves in about 30 seconds." name="IDR_ERROR_SERVICE_UNAVAILABLE">
         The service is temporarily unavailable. Please try again later.
-- 
cgit v1.1