diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 02:26:55 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 02:26:55 +0000 |
| commit | 92cd6b4ae6bc0276df4c5ecc00a060928d064520 (patch) | |
| tree | bbd0798598b4128dd749e30c94b39da75794443f /remoting | |
| parent | be9483bfdd15c5dfc55c88542947079ce18d53e0 (diff) | |
| download | chromium_src-92cd6b4ae6bc0276df4c5ecc00a060928d064520.zip chromium_src-92cd6b4ae6bc0276df4c5ecc00a060928d064520.tar.gz chromium_src-92cd6b4ae6bc0276df4c5ecc00a060928d064520.tar.bz2 | |
Enable PIN prompt for Me2Me client.
BUG=107777
Review URL: https://chromiumcodereview.appspot.com/9235024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/webapp/client_screen.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/remoting/webapp/client_screen.js b/remoting/webapp/client_screen.js index 3577f79..dee5d46 100644 --- a/remoting/webapp/client_screen.js +++ b/remoting/webapp/client_screen.js @@ -419,9 +419,8 @@ remoting.connectMe2Me = function(hostId, retryIfOffline) { remoting.hostId = hostId; remoting.retryIfOffline = retryIfOffline; - // TODO(jamiewalch): Reinstate the PIN screen once it's supported. - // remoting.setMode(remoting.AppMode.CLIENT_PIN_PROMPT); - remoting.connectMe2MeWithPin(); + // TODO(sergeyu): Ask pin only when it is necessary: crbug.com/111290 . + remoting.setMode(remoting.AppMode.CLIENT_PIN_PROMPT); } /** @@ -462,7 +461,7 @@ function connectMe2MeWithAccessToken_(token) { remoting.clientSession = new remoting.ClientSession( remoting.hostJid, remoting.hostPublicKey, - pin, "v1_token", remoting.hostId, + pin, "spake2_hmac,spake2_plain", remoting.hostId, /** @type {string} */ (remoting.oauth2.getCachedEmail()), remoting.ClientSession.Mode.ME2ME, onClientStateChange_); remoting.clientSession.createPluginAndConnect( |