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

Unified Diff: remoting/webapp/remoting.js

Issue 439923002: Hangout remote desktop part I - It2Me mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
« remoting/webapp/main.css ('K') | « remoting/webapp/main.css ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/remoting.js
diff --git a/remoting/webapp/remoting.js b/remoting/webapp/remoting.js
index 7bc5931f39cd84a2eef796cf3922078992e1646f..aba287436a753b23e5ef812eea8e003a571622d5 100644
--- a/remoting/webapp/remoting.js
+++ b/remoting/webapp/remoting.js
@@ -141,6 +141,16 @@ remoting.init = function() {
var hostId = urlParams['hostId'];
remoting.connectMe2Me(hostId);
return;
+ } else if (urlParams['mode'] == 'hrd') {
+ var accessCode = urlParams['accessCode'];
+ remoting.ensureSessionConnector_();
+ remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
+ remoting.connector.connectIT2Me(accessCode);
+
+ document.body.classList.add('hrd');
+ var HRDHelperSession = new remoting.HRDHelperSession();
+ HRDHelperSession.init();
+ return;
}
}
// No valid URL parameters, start up normally.
@@ -529,7 +539,7 @@ remoting.generateXsrfToken = function() {
/**
* Tests whether we are running on Mac.
*
- * @return {bool} True if the platform is Mac.
+ * @return {boolean} True if the platform is Mac.
kelvinp 2014/08/05 01:31:20 Applying Jamie's change to fix jscompile locally t
Jamie 2014/08/05 21:15:14 This has now landed on trunk, so you'll need to re
*/
remoting.platformIsMac = function() {
return navigator.platform.indexOf('Mac') != -1;
@@ -538,7 +548,7 @@ remoting.platformIsMac = function() {
/**
* Tests whether we are running on Windows.
*
- * @return {bool} True if the platform is Windows.
+ * @return {boolean} True if the platform is Windows.
*/
remoting.platformIsWindows = function() {
return navigator.platform.indexOf('Win32') != -1;
@@ -547,7 +557,7 @@ remoting.platformIsWindows = function() {
/**
* Tests whether we are running on Linux.
*
- * @return {bool} True if the platform is Linux.
+ * @return {boolean} True if the platform is Linux.
*/
remoting.platformIsLinux = function() {
return (navigator.platform.indexOf('Linux') != -1) &&
@@ -557,8 +567,8 @@ remoting.platformIsLinux = function() {
/**
* Tests whether we are running on ChromeOS.
*
- * @return {bool} True if the platform is ChromeOS.
+ * @return {boolean} True if the platform is ChromeOS.
*/
remoting.platformIsChromeOS = function() {
- return navigator.userAgent.match(/\bCrOS\b/);
+ return navigator.userAgent.match(/\bCrOS\b/) != null;
}
« remoting/webapp/main.css ('K') | « remoting/webapp/main.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698