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

Side by Side Diff: net/proxy/single_threaded_proxy_resolver.h

Issue 2945004: Revert 51877, since SpdyNetworkTransactionTest.CorruptFrameSessionError start... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 5 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 | « net/proxy/proxy_service.cc ('k') | net/proxy/single_threaded_proxy_resolver.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_PROXY_SINGLE_THREADED_PROXY_RESOLVER_H_ 5 #ifndef NET_PROXY_SINGLE_THREADED_PROXY_RESOLVER_H_
6 #define NET_PROXY_SINGLE_THREADED_PROXY_RESOLVER_H_ 6 #define NET_PROXY_SINGLE_THREADED_PROXY_RESOLVER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // executing on |thread_|. 85 // executing on |thread_|.
86 scoped_ptr<base::Thread> thread_; 86 scoped_ptr<base::Thread> thread_;
87 87
88 PendingJobsQueue pending_jobs_; 88 PendingJobsQueue pending_jobs_;
89 scoped_refptr<SetPacScriptTask> outstanding_set_pac_script_task_; 89 scoped_refptr<SetPacScriptTask> outstanding_set_pac_script_task_;
90 }; 90 };
91 91
92 } // namespace net 92 } // namespace net
93 93
94 #endif // NET_PROXY_SINGLE_THREADED_PROXY_RESOLVER_H_ 94 #endif // NET_PROXY_SINGLE_THREADED_PROXY_RESOLVER_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_service.cc ('k') | net/proxy/single_threaded_proxy_resolver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698