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

Side by Side Diff: net/http/http_network_layer.cc

Issue 10209012: Move SpdyFramer::set_enable_compression_default to BufferedSpdyFramer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move to BufferedSpdyFramer Created 8 years, 7 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 | net/spdy/buffered_spdy_framer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "net/http/http_network_layer.h" 5 #include "net/http/http_network_layer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/string_split.h" 9 #include "base/string_split.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 HttpStreamFactory::set_force_spdy_always(true); 70 HttpStreamFactory::set_force_spdy_always(true);
71 } else if (option == kSSL) { 71 } else if (option == kSSL) {
72 SpdySession::set_default_protocol(kProtoSPDY2); 72 SpdySession::set_default_protocol(kProtoSPDY2);
73 HttpStreamFactory::set_force_spdy_over_ssl(true); 73 HttpStreamFactory::set_force_spdy_over_ssl(true);
74 HttpStreamFactory::set_force_spdy_always(true); 74 HttpStreamFactory::set_force_spdy_always(true);
75 } else if (option == kDisablePing) { 75 } else if (option == kDisablePing) {
76 SpdySession::set_enable_ping_based_connection_checking(false); 76 SpdySession::set_enable_ping_based_connection_checking(false);
77 } else if (option == kExclude) { 77 } else if (option == kExclude) {
78 HttpStreamFactory::add_forced_spdy_exclusion(value); 78 HttpStreamFactory::add_forced_spdy_exclusion(value);
79 } else if (option == kDisableCompression) { 79 } else if (option == kDisableCompression) {
80 SpdyFramer::set_enable_compression_default(false); 80 BufferedSpdyFramer::set_enable_compression_default(false);
81 } else if (option == kDisableAltProtocols) { 81 } else if (option == kDisableAltProtocols) {
82 HttpStreamFactory::set_use_alternate_protocols(false); 82 HttpStreamFactory::set_use_alternate_protocols(false);
83 } else if (option == kForceAltProtocols) { 83 } else if (option == kForceAltProtocols) {
84 PortAlternateProtocolPair pair; 84 PortAlternateProtocolPair pair;
85 pair.port = 443; 85 pair.port = 443;
86 pair.protocol = NPN_SPDY_2; 86 pair.protocol = NPN_SPDY_2;
87 HttpServerPropertiesImpl::ForceAlternateProtocol(pair); 87 HttpServerPropertiesImpl::ForceAlternateProtocol(pair);
88 } else if (option == kSingleDomain) { 88 } else if (option == kSingleDomain) {
89 SpdySessionPool::ForceSingleDomain(); 89 SpdySessionPool::ForceSingleDomain();
90 LOG(ERROR) << "FORCING SINGLE DOMAIN"; 90 LOG(ERROR) << "FORCING SINGLE DOMAIN";
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 123
124 if (session_) 124 if (session_)
125 session_->CloseIdleConnections(); 125 session_->CloseIdleConnections();
126 } 126 }
127 127
128 void HttpNetworkLayer::OnResume() { 128 void HttpNetworkLayer::OnResume() {
129 suspended_ = false; 129 suspended_ = false;
130 } 130 }
131 131
132 } // namespace net 132 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/spdy/buffered_spdy_framer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698