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

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

Issue 1191883002: Revert of [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
Index: remoting/webapp/app_remoting/js/app_remoting.js
diff --git a/remoting/webapp/app_remoting/js/app_remoting.js b/remoting/webapp/app_remoting/js/app_remoting.js
index 80417cbfe735d0fef31d55ec998688a104976b69..87b913464aa822518e96ba9a401737a9ab9e79e4 100644
--- a/remoting/webapp/app_remoting/js/app_remoting.js
+++ b/remoting/webapp/app_remoting/js/app_remoting.js
@@ -14,59 +14,25 @@
var remoting = remoting || {};
/**
- * Parameters for the remoting.AppRemoting constructor.
- *
- * appId: The application ID. If this is not specified than the app id will
- * be extracted from the app's manifest.
- *
- * appCapabilites: Array of application capabilites.
- *
- * licenseManager: Licence manager for this application.
- *
- * @typedef {{
- * appId: (string|undefined),
- * appCapabilities: (Array<string>|undefined),
- * licenseManager: (remoting.LicenseManager|undefined)
- * }}
- */
-remoting.AppRemotingParams;
-
-/**
- * @param {remoting.AppRemotingParams} args
+ * @param {Array<string>} appCapabilities Array of application capabilities.
+ * @param {remoting.LicenseManager=} opt_licenseManager
* @constructor
* @implements {remoting.ApplicationInterface}
* @extends {remoting.Application}
*/
-remoting.AppRemoting = function(args) {
+remoting.AppRemoting = function(appCapabilities, opt_licenseManager) {
base.inherits(this, remoting.Application);
/** @private {remoting.Activity} */
this.activity_ = null;
- /** @private {string} */
- this.appId_ = (args.appId) ? args.appId : chrome.runtime.id;
-
/** @private */
- this.licenseManager_ = (args.licenseManager) ?
- args.licenseManager :
+ this.licenseManager_ = (opt_licenseManager) ?
+ opt_licenseManager :
new remoting.GaiaLicenseManager();
/** @private */
- this.appCapabilities_ = (args.appCapabilities) ? args.appCapabilities : [];
-
- // This prefix must be added to message window paths so that the HTML
- // files can be found in the shared module.
- // TODO(garykac) Add support for dev/prod shared modules.
- remoting.MessageWindow.htmlFilePrefix =
- "_modules/koejkfhmphamcgafjmkellhnekdkopod/";
-};
-
-/**
- * @return {string} Application Id.
- * @override {remoting.ApplicationInterface}
- */
-remoting.AppRemoting.prototype.getApplicationId = function() {
- return this.appId_;
+ this.appCapabilities_ = appCapabilities;
};
/**

Powered by Google App Engine
This is Rietveld 408576698