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

Unified Diff: remoting/webapp/crd/js/crd_main.js

Issue 874683002: Fix host installation on i686 Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/crd/html/ui_it2me.html ('k') | remoting/webapp/crd/js/host_installer.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/crd/js/crd_main.js
diff --git a/remoting/webapp/crd/js/crd_main.js b/remoting/webapp/crd/js/crd_main.js
index 9b57b2335a3e3940ce0ca4f78a4b5c417acd9dec..f77232075788627fdf39d512d4a79b4c1f622aa7 100644
--- a/remoting/webapp/crd/js/crd_main.js
+++ b/remoting/webapp/crd/js/crd_main.js
@@ -19,16 +19,16 @@ remoting.initHostlist_ = function() {
document.getElementById('host-list-loading-indicator'));
isHostModeSupported_().then(
- /** @param {Boolean} supported */
- function(supported){
- if (supported) {
- var noShare = document.getElementById('chrome-os-no-share');
- noShare.parentNode.removeChild(noShare);
- } else {
- var button = document.getElementById('share-button');
- button.disabled = true;
- }
- });
+ /** @param {Boolean} supported */
+ function(supported) {
+ if (supported) {
+ var noShare = document.getElementById('unsupported-platform-message');
+ noShare.parentNode.removeChild(noShare);
+ } else {
+ var button = document.getElementById('share-button');
+ button.disabled = true;
+ }
+ });
/**
* @return {Promise} A promise that resolves to the id of the current
@@ -87,20 +87,16 @@ remoting.initHostlist_ = function() {
}
/**
- * Returns whether Host mode is supported on this platform for It2me.
- * TODO(kelvinp): Remove this function once It2me is enabled on Chrome OS (See
- * crbug.com/429860).
+ * Returns whether Host mode is supported on this platform for It2Me.
*
* @return {Promise} Resolves to true if Host mode is supported.
*/
function isHostModeSupported_() {
- if (!remoting.platformIsChromeOS()) {
+ if (remoting.HostInstaller.canInstall()) {
return Promise.resolve(true);
}
- // Sharing on Chrome OS is currently behind a flag.
- // isInstalled() will return false if the flag is disabled.
- var hostInstaller = new remoting.HostInstaller();
- return hostInstaller.isInstalled();
+
+ return remoting.HostInstaller.isInstalled();
}
/**
« no previous file with comments | « remoting/webapp/crd/html/ui_it2me.html ('k') | remoting/webapp/crd/js/host_installer.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698