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

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

Issue 1081813007: Make loading dialog prettier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reviewer feedback. Created 5 years, 8 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
Index: remoting/webapp/app_remoting/js/loading_window.js
diff --git a/remoting/webapp/app_remoting/js/loading_window.js b/remoting/webapp/app_remoting/js/loading_window.js
index b14f19db0c68a1cabb1176cc1eebfeb3b705da30..e70c35ebcbf380e8ee94da71ded69a6d32db5790 100644
--- a/remoting/webapp/app_remoting/js/loading_window.js
+++ b/remoting/webapp/app_remoting/js/loading_window.js
@@ -42,19 +42,22 @@ remoting.LoadingWindow.show = function() {
// Timeout is currently 15min to handle when we need to spin up a new VM.
var kConnectionTimeout = 15 * 60 * 1000;
+ var options = /** @type {remoting.MessageWindowOptions} */ ({
+ title: remoting.app.getApplicationName(),
+ message: chrome.i18n.getMessage(/*i18n-content*/'FOOTER_CONNECTING'),
+ buttonLabel: chrome.i18n.getMessage(/*i18n-content*/'CANCEL'),
+ onResult: remoting.MessageWindow.quitApp,
+ duration: kConnectionTimeout,
+ onTimeout: remoting.LoadingWindow.onTimeout_,
+ htmlFile: 'loading_window.html',
+ frame: 'none'
+ });
var transparencyWarning = '';
if (remoting.platformIsMac()) {
- transparencyWarning =
+ options.infoBox =
chrome.i18n.getMessage(/*i18n-content*/'NO_TRANSPARENCY_WARNING');
}
- remoting.loadingWindow_ = remoting.MessageWindow.showTimedMessageWindow(
- remoting.app.getApplicationName(),
- chrome.i18n.getMessage(/*i18n-content*/'FOOTER_CONNECTING'),
- transparencyWarning,
- chrome.i18n.getMessage(/*i18n-content*/'CANCEL'),
- remoting.MessageWindow.quitApp,
- kConnectionTimeout,
- remoting.LoadingWindow.onTimeout_);
+ remoting.loadingWindow_ = new remoting.MessageWindow(options);
};
/**
« no previous file with comments | « remoting/webapp/app_remoting/html/template_loading_window.html ('k') | remoting/webapp/base/html/message_window.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698