diff options
| author | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 07:31:05 +0000 |
|---|---|---|
| committer | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 07:31:05 +0000 |
| commit | 6583ed607fba49f241d8fe260b8927d3269910a0 (patch) | |
| tree | 1ab3673acef4481d23fc7e50bbe3992fb86b0d5e /remoting/base | |
| parent | 6a7c000f9841e3011d428ddc94b15a3fa2904325 (diff) | |
| download | chromium_src-6583ed607fba49f241d8fe260b8927d3269910a0.zip chromium_src-6583ed607fba49f241d8fe260b8927d3269910a0.tar.gz chromium_src-6583ed607fba49f241d8fe260b8927d3269910a0.tar.bz2 | |
Make host/url references configurable.
In C++, they're all passed as optional command line parameters (like google_apis/gaia already allows us to do with the gaia oauth urls). So one can start the host with a monstrosity such as:
out/Debug/remoting_me2me_host out/Debug/remoting_start_host --gaia-host=accounts.google.com --oauth-user-info-url=https://www.googleapis.com/oauth2/v1/userinfo --chromoting-bot-jid=remoting@bot.talk.google.com --chromoting-base-url=https://www.googleapis.com/chromoting/v1 --talk-server-host=talk.google.com --talk-server-port=5222 -[-disable-talk-server-tls] --oauth2-token-url=https://accounts.google.com/o/oauth2/token
In Javascript and IT2Me, unfortunately we don't have a command line, so instead we put all these settings in plugin_settings.js, and the javascript passes them all into the it2me plugin as appropriate. They can then be changed by manually hacking plugin_settings.js and manifest.json in the build output, changing the remoting.settings object at runtime (although any new hosts you configure that are not in the manifest's CSP won't work), or, preferrably, by passing them via environment variables to the build, and letting build-webapp.py do its magic - for example, like with this:
GOOGLE_CLIENT_ID_REMOTING=<clientid> GOOGLE_CLIENT_SECRET_REMOTING=<secret> OAUTH2_ACCOUNTS_HOST=https://accounts.google.com OAUTH2_API_HOST=https://www.googleapis.com CHROMOTING_BOT_JID=remoting@bot.talk.google.com CHROMOTING_API_HOST=https://www.googleapis.com TALK_SERVER_HOST=talk.google.com TALK_SERVER_PORT=5222 TALK_SERVER_USE_TLS=true TALK_GADGET_HOST_SUFFIX=talkgadget.google.com OAUTH2_REDIRECT_HOST_PREFIX=https://chromoting-oauth. TALK_GADGET_HOST_PREFIX=https://chromoting-client. ninja -C out/Debug remoting_webapp
I've tested with me2me (host and client) and it2me (share and access), and verified both that the defaults work as before (without command line parameters), and that I can substitute test server hostnames in all of those parameters.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11346040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
| -rw-r--r-- | remoting/base/constants.cc | 2 | ||||
| -rw-r--r-- | remoting/base/constants.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/remoting/base/constants.cc b/remoting/base/constants.cc index a93f0f4..0099570 100644 --- a/remoting/base/constants.cc +++ b/remoting/base/constants.cc @@ -6,8 +6,6 @@ namespace remoting { -const char kChromotingBotJid[] = "remoting@bot.talk.google.com"; - const char kChromotingTokenDefaultServiceName[] = "chromiumsync"; const char kChromotingXmlNamespace[] = "google:remoting"; diff --git a/remoting/base/constants.h b/remoting/base/constants.h index f5ea537..80c5572 100644 --- a/remoting/base/constants.h +++ b/remoting/base/constants.h @@ -7,8 +7,6 @@ namespace remoting { -extern const char kChromotingBotJid[]; - // Service name used for authentication. // TODO(ajwong): Remove this once we've killed off XmppToken usage. // BUG:83897 |