summaryrefslogtreecommitdiffstats
path: root/remoting/client/appengine/main.py
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 01:22:44 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 01:22:44 +0000
commitf177a378b264032c720c8fdb2e3f994fd14d3c4e (patch)
treeb9c1f18fc4396ba8b7184a2eba55c672ed6d22e1 /remoting/client/appengine/main.py
parent888ed866c56f76d8d7c98ab26839eb5e126b9bb4 (diff)
downloadchromium_src-f177a378b264032c720c8fdb2e3f994fd14d3c4e.zip
chromium_src-f177a378b264032c720c8fdb2e3f994fd14d3c4e.tar.gz
chromium_src-f177a378b264032c720c8fdb2e3f994fd14d3c4e.tar.bz2
Update Chromoting app-engine to invoke sandboxed connections.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6758043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/appengine/main.py')
-rw-r--r--remoting/client/appengine/main.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/remoting/client/appengine/main.py b/remoting/client/appengine/main.py
index 78900c2..36f81d7 100644
--- a/remoting/client/appengine/main.py
+++ b/remoting/client/appengine/main.py
@@ -1,5 +1,9 @@
#!/usr/bin/env python
+# 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.
+
import logging
import os
@@ -36,7 +40,10 @@ class ChromotingSessionHandler(webapp.RequestHandler):
'hostname': self.request.get('hostname'),
'username': users.get_current_user().email(),
'hostjid': self.request.get('hostjid'),
+ 'connect_method': self.request.get('connect_method'),
+ 'insecure': self.request.get('insecure'),
'xmpp_token': auth.GetXmppToken(),
+ 'http_xmpp_proxy': auth.GetHttpXmppProxy(),
}
path = os.path.join(os.path.dirname(__file__), 'chromoting_session.html')
self.response.out.write(template.render(path, template_params))