Commit 86559c89 authored by garykac@chromium.org's avatar garykac@chromium.org

[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
parent 467cbf47
...@@ -167,7 +167,8 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin, ...@@ -167,7 +167,8 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin,
# Set the correct OAuth2 redirect URL. # Set the correct OAuth2 redirect URL.
baseUrl = ( baseUrl = (
'https://talkgadget.google.com/talkgadget/oauth/chrome-remote-desktop') 'https://chromoting.talkgadget.google.com/'
'talkgadget/oauth/chrome-remote-desktop')
if (buildtype == 'Official'): if (buildtype == 'Official'):
oauth2RedirectUrlJs = ( oauth2RedirectUrlJs = (
"'" + baseUrl + "/rel/' + chrome.i18n.getMessage('@@extension_id')") "'" + baseUrl + "/rel/' + chrome.i18n.getMessage('@@extension_id')")
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"permissions": [ "permissions": [
"https://accounts.google.com/*", "https://accounts.google.com/*",
"https://www.googleapis.com/chromoting/*", "https://www.googleapis.com/chromoting/*",
"https://talkgadget.google.com/talkgadget/*", "https://*.talkgadget.google.com/talkgadget/*",
"https://relay.google.com/*", "https://relay.google.com/*",
"clipboardRead", "clipboardRead",
"clipboardWrite" "clipboardWrite"
......
...@@ -56,7 +56,7 @@ remoting.WcsLoader.load = function(onReady, onError) { ...@@ -56,7 +56,7 @@ remoting.WcsLoader.load = function(onReady, onError) {
* @private * @private
*/ */
remoting.WcsLoader.prototype.TALK_GADGET_URL_ = remoting.WcsLoader.prototype.TALK_GADGET_URL_ =
'https://talkgadget.google.com/talkgadget/'; 'https://chromoting.talkgadget.google.com/talkgadget/';
/** /**
* The id of the script node. * The id of the script node.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment