Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(512)

Side by Side Diff: remoting/webapp/build-webapp.py

Issue 10789054: [Chromoting] Add wildcard to talkgadget in manifest permissions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-add wildcard to talkgadget Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | remoting/webapp/manifest.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """Creates a directory with with the unpacked contents of the remoting webapp. 6 """Creates a directory with with the unpacked contents of the remoting webapp.
7 7
8 The directory will contain a copy-of or a link-to to all remoting webapp 8 The directory will contain a copy-of or a link-to to all remoting webapp
9 resources. This includes HTML/JS and any plugin binaries. The script also 9 resources. This includes HTML/JS and any plugin binaries. The script also
10 massages resulting files appropriately with host plugin data. Finally, 10 massages resulting files appropriately with host plugin data. Finally,
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 'FULL_APP_VERSION', 160 'FULL_APP_VERSION',
161 version) 161 version)
162 162
163 # Set the correct mimetype. 163 # Set the correct mimetype.
164 findAndReplace(os.path.join(destination, 'plugin_settings.js'), 164 findAndReplace(os.path.join(destination, 'plugin_settings.js'),
165 'HOST_PLUGIN_MIMETYPE', 165 'HOST_PLUGIN_MIMETYPE',
166 mimetype) 166 mimetype)
167 167
168 # Set the correct OAuth2 redirect URL. 168 # Set the correct OAuth2 redirect URL.
169 baseUrl = ( 169 baseUrl = (
170 'https://talkgadget.google.com/talkgadget/oauth/chrome-remote-desktop') 170 'https://chromoting.talkgadget.google.com/'
Jamie 2012/07/30 23:17:33 This is just the OAuth redirect URL. If we change
171 'talkgadget/oauth/chrome-remote-desktop')
171 if (buildtype == 'Official'): 172 if (buildtype == 'Official'):
172 oauth2RedirectUrlJs = ( 173 oauth2RedirectUrlJs = (
173 "'" + baseUrl + "/rel/' + chrome.i18n.getMessage('@@extension_id')") 174 "'" + baseUrl + "/rel/' + chrome.i18n.getMessage('@@extension_id')")
174 oauth2RedirectUrlJson = baseUrl + '/rel/*' 175 oauth2RedirectUrlJson = baseUrl + '/rel/*'
175 else: 176 else:
176 oauth2RedirectUrlJs = "'" + baseUrl + "/dev'" 177 oauth2RedirectUrlJs = "'" + baseUrl + "/dev'"
177 oauth2RedirectUrlJson = baseUrl + '/dev*' 178 oauth2RedirectUrlJson = baseUrl + '/dev*'
178 findAndReplace(os.path.join(destination, 'plugin_settings.js'), 179 findAndReplace(os.path.join(destination, 'plugin_settings.js'),
179 "'OAUTH2_REDIRECT_URL'", 180 "'OAUTH2_REDIRECT_URL'",
180 oauth2RedirectUrlJs) 181 oauth2RedirectUrlJs)
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 else: 226 else:
226 files.append(arg) 227 files.append(arg)
227 228
228 buildWebApp(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], 229 buildWebApp(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5],
229 sys.argv[6], files, locales) 230 sys.argv[6], files, locales)
230 return 0 231 return 0
231 232
232 233
233 if __name__ == '__main__': 234 if __name__ == '__main__':
234 sys.exit(main()) 235 sys.exit(main())
OLDNEW
« no previous file with comments | « no previous file | remoting/webapp/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698