diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 01:19:23 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 01:19:23 +0000 |
| commit | 86559c89b11899bd1ef0480c4ead2342b6d51b97 (patch) | |
| tree | a66e3b8472a6b189ca7ca6793b439a526202b1ae /remoting/webapp | |
| parent | 467cbf47df58dbc215b058958bd07ab3d359c83e (diff) | |
| download | chromium_src-86559c89b11899bd1ef0480c4ead2342b6d51b97.zip chromium_src-86559c89b11899bd1ef0480c4ead2342b6d51b97.tar.gz chromium_src-86559c89b11899bd1ef0480c4ead2342b6d51b97.tar.bz2 | |
[Chromoting] Add wildcard to talkgadget in manifest permissions.
This grants permission to <anything>.talkgadget.google.com as well as allowing
simply talkgadget.google.com.
This is to prepare for (1) changing the default talkgadget name to something
specific to chromoting and (2) adding a policy setting that allows the
talkgadget name to be changed.
BUG=108448
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10789054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp')
| -rwxr-xr-x | remoting/webapp/build-webapp.py | 3 | ||||
| -rw-r--r-- | remoting/webapp/manifest.json | 2 | ||||
| -rw-r--r-- | remoting/webapp/wcs_loader.js | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py index b36f64f..68b1aa8 100755 --- a/remoting/webapp/build-webapp.py +++ b/remoting/webapp/build-webapp.py @@ -167,7 +167,8 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin, # Set the correct OAuth2 redirect URL. baseUrl = ( - 'https://talkgadget.google.com/talkgadget/oauth/chrome-remote-desktop') + 'https://chromoting.talkgadget.google.com/' + 'talkgadget/oauth/chrome-remote-desktop') if (buildtype == 'Official'): oauth2RedirectUrlJs = ( "'" + baseUrl + "/rel/' + chrome.i18n.getMessage('@@extension_id')") diff --git a/remoting/webapp/manifest.json b/remoting/webapp/manifest.json index 2a1335f..e51c300 100644 --- a/remoting/webapp/manifest.json +++ b/remoting/webapp/manifest.json @@ -24,7 +24,7 @@ "permissions": [ "https://accounts.google.com/*", "https://www.googleapis.com/chromoting/*", - "https://talkgadget.google.com/talkgadget/*", + "https://*.talkgadget.google.com/talkgadget/*", "https://relay.google.com/*", "clipboardRead", "clipboardWrite" diff --git a/remoting/webapp/wcs_loader.js b/remoting/webapp/wcs_loader.js index 000369d..b01d6a0 100644 --- a/remoting/webapp/wcs_loader.js +++ b/remoting/webapp/wcs_loader.js @@ -56,7 +56,7 @@ remoting.WcsLoader.load = function(onReady, onError) { * @private */ remoting.WcsLoader.prototype.TALK_GADGET_URL_ = - 'https://talkgadget.google.com/talkgadget/'; + 'https://chromoting.talkgadget.google.com/talkgadget/'; /** * The id of the script node. |