diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 02:58:29 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 02:58:29 +0000 |
| commit | 714384c0a2fd6009b24f047de6ffa47a8d709c65 (patch) | |
| tree | 66f0df2f4ea03183c125c8c6643ca8e457810004 /chrome/app | |
| parent | 13a571ebab723825adf866bfe8b0fd952b338339 (diff) | |
| download | chromium_src-714384c0a2fd6009b24f047de6ffa47a8d709c65.zip chromium_src-714384c0a2fd6009b24f047de6ffa47a8d709c65.tar.gz chromium_src-714384c0a2fd6009b24f047de6ffa47a8d709c65.tar.bz2 | |
Revert 214289 "[SPDY] Add strings and constants for HTTP/2 draft 04"
> [SPDY] Add strings and constants for HTTP/2 draft 04
>
> There are still differences between SPDY/4 and HTTP/2 draft 04; those
> will be ironed out in upcoming CLs.
>
> Add kProtoHTTP2Draft04 to SPDY NextProto-parametrized tests.
>
> Move NextProto -> SpdyMajorVersion conversion to buffered_spdy_framer.h.
>
> Remove unused SpdyMajorVersion -> NextProto conversion.
>
> Clean up HttpResponseInfo::ConnectionInfo a bit and add a TODO to
> remove it.
>
> Parametrize SSLClientSocketPoolTest on NextProto.
>
> BUG=265615
> R=darin@chromium.org, rch@chromium.org
>
> Review URL: https://codereview.chromium.org/21131002
TBR=akalin@chromium.org
Review URL: https://codereview.chromium.org/21202002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e52871b..4f64b14 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6862,12 +6862,6 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_ENABLE_SPDY4A2_DESCRIPTION" desc="Description for the flag to enable SPDY/4 alpha 2."> Enable experimental SPDY/4 alpha 2. </message> - <message name="IDS_FLAGS_ENABLE_HTTP2_DRAFT_04_NAME" desc="Title for the flag to enable HTTP/2 draft 04"> - Enable HTTP/2 draft 04. - </message> - <message name="IDS_FLAGS_ENABLE_HTTP2_DRAFT_04_DESCRIPTION" desc="Description for the flag to enable HTTP/2 draft 04."> - Enable experimental HTTP/2 draft 04. - </message> <message name="IDS_FLAGS_ENABLE_ASYNC_DNS_NAME" desc="Title for the flag to enable asynchronous DNS client."> Built-in Asynchronous DNS </message> |