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

Unified Diff: remoting/webapp/base/js/message_window_helper.js

Issue 1179873005: [AppRemoting] Break out AppRemoting shared module (re-land). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « remoting/webapp/base/js/application.js ('k') | remoting/webapp/base/js/plugin_settings.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/base/js/message_window_helper.js
diff --git a/remoting/webapp/base/js/message_window_helper.js b/remoting/webapp/base/js/message_window_helper.js
index d608a034829f54f54688f95b9729821308438218..51d63c0d41ba7f666e6480736953a81e759d215f 100644
--- a/remoting/webapp/base/js/message_window_helper.js
+++ b/remoting/webapp/base/js/message_window_helper.js
@@ -121,7 +121,9 @@ remoting.MessageWindow = function(options) {
};
var htmlFile = options.htmlFile || 'message_window.html';
- chrome.app.window.create(htmlFile, windowAttributes, onCreate);
+ chrome.app.window.create(
+ remoting.MessageWindow.htmlFilePrefix + htmlFile,
+ windowAttributes, onCreate);
if (duration != 0) {
this.timer_ = window.setTimeout(this.onTimeoutHandler_.bind(this),
@@ -130,6 +132,15 @@ remoting.MessageWindow = function(options) {
};
/**
+ * This string is prepended to the htmlFile when message windows are created.
+ * Normally, this should be left empty, but the shared module needs to specify
+ * this so that the shared HTML files can be found when running in the
+ * context of the app stub.
+ * @type {string}
+ */
+remoting.MessageWindow.htmlFilePrefix = "";
+
+/**
* Called when the timer runs out. This in turn calls the window's
* timeout handler (if any).
*/
« no previous file with comments | « remoting/webapp/base/js/application.js ('k') | remoting/webapp/base/js/plugin_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698