diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 16:50:09 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 16:50:09 +0000 |
| commit | 3bffb37c9f75d9ef59cf1000a8dd9ff2fc8b0240 (patch) | |
| tree | f7e2f338158a4b550ebb970f51fcdf97b5cd15db /chrome/browser/resources | |
| parent | 331c03c9ea6b0a1ce8319c22b2cf13e975e08b73 (diff) | |
| download | chromium_src-3bffb37c9f75d9ef59cf1000a8dd9ff2fc8b0240.zip chromium_src-3bffb37c9f75d9ef59cf1000a8dd9ff2fc8b0240.tar.gz chromium_src-3bffb37c9f75d9ef59cf1000a8dd9ff2fc8b0240.tar.bz2 | |
This is a compatibility fix for Closure bug "Internally discovered high risk
XSS on multiple .google.com domains in Closure XPC (goog.net.xpc)
http://b/issue?id=3030996
http://s/?change_num=17780032
As result of the Closure change, 'xpcRelay' and 'xpcBlank'
parameters to GTalkNotifier must be absolute URLs.
Patch by ivaylobakalov@chromium.org:
http://codereview.chromium.org/4119009/show
TEST=The central roster in Chrome OS is not empty after CL 17780032.
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/chat_manager/central_roster.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/resources/chat_manager/central_roster.html b/chrome/browser/resources/chat_manager/central_roster.html index aa68798..4de11a8 100644 --- a/chrome/browser/resources/chat_manager/central_roster.html +++ b/chrome/browser/resources/chat_manager/central_roster.html @@ -86,15 +86,15 @@ Central roster: hosting all Google Talk chats in ChromeOS. function loadGTalk() { if (window.GTalkNotifier) { document.getElementById('retryInfo').style.display = 'none'; + var baseUrl = args['protocol'] + '://' + args['host'] + '/talkgadget/'; chatClient = new window.GTalkNotifier( { - 'clientBaseUrl': - args['protocol'] + '://' + args['host'] + '/talkgadget/', + 'clientBaseUrl': baseUrl, 'clientUrl': 'notifierclient' + (args['jsmode'] != '' ? ('?jsmode=' + args['jsmode']) : ''), 'propertyName': 'ChromeOS', - 'xpcRelay': 'xpc_relay', - 'xpcBlank': 'xpc_blank', + 'xpcRelay': baseUrl + 'xpc_relay', + 'xpcBlank': baseUrl + 'xpc_blank', 'locale': args['hl'], 'isCentralRoster': true, 'hideProfileCard': true, |