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

Side by Side Diff: net/http/http_stream_factory_impl_job.h

Issue 443383002: Refactor HttpStreamFactoryImpl::Job::DoCreateStream() for handling WebSocket correctly (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 4 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/http/http_stream_factory_impl_job.cc » ('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 #ifndef NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_ 5 #ifndef NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
6 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_ 6 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 int DoWaitForJob(); 170 int DoWaitForJob();
171 int DoWaitForJobComplete(int result); 171 int DoWaitForJobComplete(int result);
172 int DoInitConnection(); 172 int DoInitConnection();
173 int DoInitConnectionComplete(int result); 173 int DoInitConnectionComplete(int result);
174 int DoWaitingUserAction(int result); 174 int DoWaitingUserAction(int result);
175 int DoCreateStream(); 175 int DoCreateStream();
176 int DoCreateStreamComplete(int result); 176 int DoCreateStreamComplete(int result);
177 int DoRestartTunnelAuth(); 177 int DoRestartTunnelAuth();
178 int DoRestartTunnelAuthComplete(int result); 178 int DoRestartTunnelAuthComplete(int result);
179 179
180 // Creates a SpdyHttpStream from the given values and sets to |stream_|. Does
181 // nothing if |stream_factory_| is for WebSockets.
182 int SetSpdyHttpStream(base::WeakPtr<SpdySession> session, bool direct);
183
180 // Returns to STATE_INIT_CONNECTION and resets some state. 184 // Returns to STATE_INIT_CONNECTION and resets some state.
181 void ReturnToStateInitConnection(bool close_connection); 185 void ReturnToStateInitConnection(bool close_connection);
182 186
183 // Set the motivation for this request onto the underlying socket. 187 // Set the motivation for this request onto the underlying socket.
184 void SetSocketMotivation(); 188 void SetSocketMotivation();
185 189
186 bool IsHttpsProxyAndHttpUrl() const; 190 bool IsHttpsProxyAndHttpUrl() const;
187 191
188 // Sets several fields of ssl_config for the given origin_server based on the 192 // Sets several fields of ssl_config for the given origin_server based on the
189 // proxy info and other factors. 193 // proxy info and other factors.
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 JobStatus other_job_status_; 336 JobStatus other_job_status_;
333 337
334 base::WeakPtrFactory<Job> ptr_factory_; 338 base::WeakPtrFactory<Job> ptr_factory_;
335 339
336 DISALLOW_COPY_AND_ASSIGN(Job); 340 DISALLOW_COPY_AND_ASSIGN(Job);
337 }; 341 };
338 342
339 } // namespace net 343 } // namespace net
340 344
341 #endif // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_ 345 #endif // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698