summaryrefslogtreecommitdiffstats
path: root/remoting/webapp/error.js
diff options
context:
space:
mode:
authorjamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-02 17:14:52 +0000
committerjamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-02 17:14:52 +0000
commit35b423a8e761e5f7f94618ad6484933c3614a409 (patch)
treea1b1902438445fe2e7064ed116a8ba9629abf6d1 /remoting/webapp/error.js
parenta77575d3bda80b4e1a7ef69411e4540269a77e39 (diff)
downloadchromium_src-35b423a8e761e5f7f94618ad6484933c3614a409.zip
chromium_src-35b423a8e761e5f7f94618ad6484933c3614a409.tar.gz
chromium_src-35b423a8e761e5f7f94618ad6484933c3614a409.tar.bz2
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
Diffstat (limited to 'remoting/webapp/error.js')
-rw-r--r--remoting/webapp/error.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/webapp/error.js b/remoting/webapp/error.js
index ff8b529..a1e3ab3 100644
--- a/remoting/webapp/error.js
+++ b/remoting/webapp/error.js
@@ -11,7 +11,6 @@ var remoting = remoting || {};
* @enum {string} All error messages from messages.json
*/
remoting.Error = {
- NO_RESPONSE: /*i18n-content*/'ERROR_NO_RESPONSE',
INVALID_ACCESS_CODE: /*i18n-content*/'ERROR_INVALID_ACCESS_CODE',
MISSING_PLUGIN: /*i18n-content*/'ERROR_MISSING_PLUGIN',
AUTHENTICATION_FAILED: /*i18n-content*/'ERROR_AUTHENTICATION_FAILED',
@@ -23,5 +22,6 @@ remoting.Error = {
UNEXPECTED: /*i18n-content*/'ERROR_UNEXPECTED',
SERVICE_UNAVAILABLE: /*i18n-content*/'ERROR_SERVICE_UNAVAILABLE',
NOT_AUTHENTICATED: /*i18n-content*/'ERROR_NOT_AUTHENTICATED',
- INVALID_HOST_DOMAIN: /*i18n-content*/'ERROR_INVALID_HOST_DOMAIN'
+ INVALID_HOST_DOMAIN: /*i18n-content*/'ERROR_INVALID_HOST_DOMAIN',
+ P2P_FAILURE: /*i18n-content*/'ERROR_P2P_FAILURE'
};