Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: remoting/webapp/app_remoting/js/app_remoting_activity.js

Issue 1139543002: [Chromoting] Show any startup errors in the LoadingWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Check types for optional fields. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/webapp/base/js/message_window.js » ('j') | remoting/webapp/base/js/message_window.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/app_remoting/js/app_remoting_activity.js
diff --git a/remoting/webapp/app_remoting/js/app_remoting_activity.js b/remoting/webapp/app_remoting/js/app_remoting_activity.js
index 19ec51208f6b249e4b49e3cb134b428b1ed21a2b..b4da65296451e5b5bfbc1fca2b4cf46aee669371 100644
--- a/remoting/webapp/app_remoting/js/app_remoting_activity.js
+++ b/remoting/webapp/app_remoting/js/app_remoting_activity.js
@@ -189,8 +189,8 @@ remoting.AppRemotingActivity.prototype.onDisconnected = function(error) {
* @param {!remoting.Error} error
*/
remoting.AppRemotingActivity.prototype.onConnectionFailed = function(error) {
- remoting.LoadingWindow.close();
- this.showErrorMessage_(error);
+ remoting.loadingWindow_.updateErrorMessage(
+ chrome.i18n.getMessage(error.getTag()));
this.cleanup_();
};
@@ -199,7 +199,7 @@ remoting.AppRemotingActivity.prototype.onConnectionFailed = function(error) {
* @private
*/
remoting.AppRemotingActivity.prototype.showErrorMessage_ = function(error) {
- console.error('Connection failed: ' + error.toString());
+ console.error('Error: ' + error.toString());
remoting.MessageWindow.showErrorMessage(
remoting.app.getApplicationName(),
chrome.i18n.getMessage(error.getTag()));
« no previous file with comments | « no previous file | remoting/webapp/base/js/message_window.js » ('j') | remoting/webapp/base/js/message_window.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698