summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-22 21:08:42 +0000
committerjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-22 21:08:42 +0000
commitbe1a48222695057eeca29918690c2aa213817363 (patch)
tree5bd3c3e705e9cea2928741efbc7d017627c07755 /remoting
parent34c0859183d62ebc334bd6cf79ec081b92fb0f4b (diff)
downloadchromium_src-be1a48222695057eeca29918690c2aa213817363.zip
chromium_src-be1a48222695057eeca29918690c2aa213817363.tar.gz
chromium_src-be1a48222695057eeca29918690c2aa213817363.tar.bz2
Set connection type to IT2Me earlier.
Otherwise there's no OK button on the error page (Me2Me behaviour). BUG=None TEST=Manual Review URL: http://codereview.chromium.org/9025030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/me2mom/client_screen.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/webapp/me2mom/client_screen.js b/remoting/webapp/me2mom/client_screen.js
index bc79e4f..b7e2824 100644
--- a/remoting/webapp/me2mom/client_screen.js
+++ b/remoting/webapp/me2mom/client_screen.js
@@ -70,6 +70,7 @@ remoting.currentConnectionType = null;
* calls through directly to tryConnectWithAccessToken_.
*/
remoting.tryConnect = function() {
+ remoting.currentConnectionType = remoting.ConnectionType.It2Me;
document.getElementById('cancel-button').disabled = false;
if (remoting.oauth2.needsNewAccessToken()) {
remoting.oauth2.refreshAccessToken(function(xhr) {
@@ -188,7 +189,6 @@ function tryConnectWithWcs_(success) {
showConnectError_(remoting.Error.INVALID_ACCESS_CODE);
} else {
var supportId = remoting.accessCode.substring(0, kSupportIdLen);
- remoting.currentConnectionType = remoting.ConnectionType.It2Me;
remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
resolveSupportId(supportId);
}