Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Contains all the settings that may need massaging by the build script. | 5 // Contains all the settings that may need massaging by the build script. |
| 6 // Keeping all that centralized here allows us to use symlinks for the other | 6 // Keeping all that centralized here allows us to use symlinks for the other |
| 7 // files making for a faster compile/run cycle when only modifying HTML/JS. | 7 // files making for a faster compile/run cycle when only modifying HTML/JS. |
| 8 | 8 |
| 9 'use strict'; | 9 'use strict'; |
| 10 | 10 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 !!'XMPP_SERVER_USE_TLS'; | 60 !!'XMPP_SERVER_USE_TLS'; |
| 61 | 61 |
| 62 // Third party authentication settings. | 62 // Third party authentication settings. |
| 63 /** @type {string} The third party auth redirect URI. */ | 63 /** @type {string} The third party auth redirect URI. */ |
| 64 remoting.Settings.prototype.THIRD_PARTY_AUTH_REDIRECT_URI = | 64 remoting.Settings.prototype.THIRD_PARTY_AUTH_REDIRECT_URI = |
| 65 'THIRD_PARTY_AUTH_REDIRECT_URL'; | 65 'THIRD_PARTY_AUTH_REDIRECT_URL'; |
| 66 | 66 |
| 67 // 'native', 'nacl' or 'pnacl'. | 67 // 'native', 'nacl' or 'pnacl'. |
| 68 remoting.Settings.prototype.CLIENT_PLUGIN_TYPE = 'CLIENT_PLUGIN_TYPE'; | 68 remoting.Settings.prototype.CLIENT_PLUGIN_TYPE = 'CLIENT_PLUGIN_TYPE'; |
| 69 | 69 |
| 70 /** @const {boolean} If true, use GCD instead of Chromoting registry. */ | 70 /** @const {boolean} If true, use GCD instead of Chromoting registry. */ |
|
kelvinp
2015/06/29 23:53:45
It seems like after your change, we would always b
John Williams
2015/07/17 23:29:33
I removed PREFER_GCD and kept USE_GCD as the only
| |
| 71 remoting.Settings.prototype.USE_GCD = !!'USE_GCD'; | 71 remoting.Settings.prototype.USE_GCD = !!'USE_GCD'; |
| 72 | |
| 73 /** | |
| 74 * If true, data in GCD takes priority over conflicting data in the | |
| 75 * legacy registery. | |
| 76 * @const {boolean} | |
| 77 */ | |
| 78 remoting.Settings.prototype.PREFER_GCD = remoting.Settings.prototype.USE_GCD; | |
| OLD | NEW |