diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 07:06:18 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 07:06:18 +0000 |
| commit | fa84b0d4c75afaac54a0616c3bd0efb9cbb68537 (patch) | |
| tree | 683f6add90744be002ef3aca1e25600a3e7541f9 /chrome/browser/browser_resources.grd | |
| parent | 937c710fffdcd8e04827dbf58fc273f377267661 (diff) | |
| download | chromium_src-fa84b0d4c75afaac54a0616c3bd0efb9cbb68537.zip chromium_src-fa84b0d4c75afaac54a0616c3bd0efb9cbb68537.tar.gz chromium_src-fa84b0d4c75afaac54a0616c3bd0efb9cbb68537.tar.bz2 | |
Add the whispernet proxy.
To communicate with whispernet (which needs to be checked in as a pNacl binary),
the only way possible is for us to go through an extension. This code
implements the ChromeWhispernetClient, which uses the whispernet proxy compoent
extension. This extension is implemented on top of a private API that allows it
to communicate back and forth with the ChromeWhispernetClient.
The tests for this code exist only for the ChromeWhispernetClient since they
excersize the full flow back and forth from sending a request to encode a token
to receiving the samples, and then decoding samples and receiving the correct
token.
This is our temporary measure for M38 till we can find a better way to
communicate with the whispernet library.
Owners reviews requested:
xiyuan@ - For the overall review + the whispernet proxy code in
c/b/r/whispernet_proxy
jochen@ - For adding components/copresence to c/b/DEPS
kalman@ - For the copresence_private API
ben@ - For adding the c/b/copresence directory and the OWNERS file + the
addition to c/b/browser_resources.grd
R=ben@chromium.org, jochen@chromium.org, kalman@chromium.org, xiyuan@chromium.org
BUG=365493
Review URL: https://codereview.chromium.org/438513002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index d2b7ed8..0e975f7 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -436,6 +436,7 @@ <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_method\hangul_manifest.json" type="BINDATA" /> <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_ime\manifest.json" type="BINDATA" /> </if> + <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_proxy\manifest.json" type="BINDATA" /> </includes> </release> </grit> |