Add in support for connecting with just the OAuth2 token. Default to OAuth2.

remoting/client/appengine/static_files/client.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Flag to indicate whether or not to show offline hosts in the host list.
 chromoting.showOfflineHosts = true;
 
 // String to identify bad auth tokens.
 var BAD_AUTH_TOKEN = 'bad_token';
 
@@ skipping 153 matching lines @@
       message = 'No hosts available.' +
                 ' See LINK for info on how to set up a new host.';
     } else {
       message = 'No online hosts available (' +
           numOfflineHosts + ' offline hosts).';
     }
     displayMessage(hostlistDiv, 'message', message);
   }
 }
 
+function openSession(hostname, hostjid, method) {
+  var proxy = document.getElementById('oauth2_proxy').value;
+  var token_type = 'oauth2';
+  if (document.getElementById('use_clientlogin').checked) {
+    proxy = document.getElementById('clientlogin_proxy').value;
+    token_type = 'clientlogin';
+  }
+
+  var url = 'session?hostname=' + encodeURIComponent(hostname)
+      + '&hostjid=' + encodeURIComponent(hostjid)
+      + '&http_xmpp_proxy=' + encodeURIComponent(proxy)
+      + '&token_type=' + encodeURIComponent(token_type) +
+        '&connect_method=' + encodeURIComponent(method);
+
+  window.open(url);
+}
+
 // Create a single host description element.
 function addHostInfo(host) {
   var hostEntry = document.createElement('div');
   hostEntry.setAttribute('class', 'hostentry');
 
   var hostIcon = document.createElement('img');
   hostIcon.className = "hosticon";
   hostIcon.style.height = 64;
   hostIcon.style.width = 64;
   hostEntry.appendChild(hostIcon);
 
   if (host.status == 'ONLINE') {
     var span = document.createElement('span');
     span.setAttribute('class', 'connect');
     var connect = document.createElement('input');
 
     connect.setAttribute('type', 'button');
     connect.setAttribute('value', 'Connect');
-    connect.setAttribute('onclick', "window.open('session?hostname=" +
-        encodeURIComponent(host.hostName) +
-        "&hostjid=" + encodeURIComponent(host.jabberId) +
-        "');");
+    connect.setAttribute('onclick',
+        "openSession('" + host.hostName + "', "
+        + "'" + host.jabberId + "', 'direct');");
     span.appendChild(connect);
 
     var connectSandboxed = document.createElement('input');
     connectSandboxed.setAttribute('type', 'button');
     connectSandboxed.setAttribute('value', 'Connect Sandboxed');
     connectSandboxed.setAttribute('onclick',
-        "window.open('session?hostname=" + encodeURIComponent(host.hostName) +
-        "&hostjid=" + encodeURIComponent(host.jabberId) +
-        "&http_xmpp_proxy=" + encodeURIComponent(
-            document.getElementById('http_xmpp_proxy').value) +
-        "&connect_method=sandboxed');");
+        "openSession('" + host.hostName + "', "
+        + "'" + host.jabberId + "', 'sandboxed');");
     span.appendChild(connectSandboxed);
 
     hostEntry.appendChild(span);
     hostIcon.setAttribute('src', 'static_files/online.png');
   } else {
     hostIcon.setAttribute('src', 'static_files/offline.png');
   }
 
   var hostName = document.createElement('p');
   hostName.setAttribute('class', 'hostindent hostname');
@@ skipping 42 matching lines @@
           'apps.googleusercontent.com')
       + '&redirect_uri=' + window.location.origin + '/auth/oauth2_return'
       + '&scope=' + encodeURIComponent(
           'https://www.googleapis.com/auth/chromoting ' +
           'https://www.googleapis.com/auth/googletalk')
       + '&state=' + encodeURIComponent(window.location.href)
       + '&response_type=code';
   window.location.replace(oauth_code_url);
 }