summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 18:31:40 +0000
committerjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 18:31:40 +0000
commitc8c77b0e9119cf84b970c860525aa28595e1a1e2 (patch)
tree7f85e25eb4eba9680a2f61aa8e246a961a12795c /remoting
parente218265fd85d454b9d7296e2ba70c2ec9fbe66e6 (diff)
downloadchromium_src-c8c77b0e9119cf84b970c860525aa28595e1a1e2.zip
chromium_src-c8c77b0e9119cf84b970c860525aa28595e1a1e2.tar.gz
chromium_src-c8c77b0e9119cf84b970c860525aa28595e1a1e2.tar.bz2
Use talk gadget blank page for bounce.
BUG=None TEST=Logout and reauthenticate Review URL: http://codereview.chromium.org/7739040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/me2mom/manifest.json2
-rw-r--r--remoting/webapp/me2mom/oauth2.js3
2 files changed, 1 insertions, 4 deletions
diff --git a/remoting/webapp/me2mom/manifest.json b/remoting/webapp/me2mom/manifest.json
index 8ec4f9c..df672cc 100644
--- a/remoting/webapp/me2mom/manifest.json
+++ b/remoting/webapp/me2mom/manifest.json
@@ -15,8 +15,6 @@
"content_scripts": [
{
"matches": [
- "https://chromoting-httpxmpp-oauth2-dev.corp.google.com/oauth2_trampoline",
- "https://chromoting-httpxmpp-oauth2-dev.corp.google.com/oauth2_trampoline?*",
"https://talkgadget.google.com/talkgadget/blank",
"https://talkgadget.google.com/talkgadget/blank?*"
],
diff --git a/remoting/webapp/me2mom/oauth2.js b/remoting/webapp/me2mom/oauth2.js
index 503cfec..aa1255a 100644
--- a/remoting/webapp/me2mom/oauth2.js
+++ b/remoting/webapp/me2mom/oauth2.js
@@ -34,8 +34,7 @@ remoting.OAuth2.prototype.SCOPE_ =
'https://www.googleapis.com/auth/googletalk ' +
'https://www.googleapis.com/auth/userinfo#email';
remoting.OAuth2.prototype.REDIRECT_URI_ =
- 'https://chromoting-httpxmpp-oauth2-dev.corp.google.com' +
- '/oauth2_trampoline';
+ 'https://talkgadget.google.com/talkgadget/blank';
remoting.OAuth2.prototype.OAUTH2_TOKEN_ENDPOINT_ =
'https://accounts.google.com/o/oauth2/token';