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

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

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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/base/x509_certificate_mac.cc ('k') | net/ocsp/nss_ocsp.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_DISK_CACHE_BASED_SSL_HOST_INFO_H 5 #ifndef NET_HTTP_DISK_CACHE_BASED_SSL_HOST_INFO_H
6 #define NET_HTTP_DISK_CACHE_BASED_SSL_HOST_INFO_H 6 #define NET_HTTP_DISK_CACHE_BASED_SSL_HOST_INFO_H
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/lock.h"
11 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
12 #include "base/threading/non_thread_safe.h" 11 #include "base/threading/non_thread_safe.h"
13 #include "base/weak_ptr.h" 12 #include "base/weak_ptr.h"
14 #include "net/base/completion_callback.h" 13 #include "net/base/completion_callback.h"
15 #include "net/disk_cache/disk_cache.h" 14 #include "net/disk_cache/disk_cache.h"
16 #include "net/socket/ssl_host_info.h" 15 #include "net/socket/ssl_host_info.h"
17 16
18 namespace net { 17 namespace net {
19 18
20 class HttpCache; 19 class HttpCache;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 disk_cache::Entry* entry_; 118 disk_cache::Entry* entry_;
120 CompletionCallback* user_callback_; 119 CompletionCallback* user_callback_;
121 scoped_refptr<net::IOBuffer> read_buffer_; 120 scoped_refptr<net::IOBuffer> read_buffer_;
122 scoped_refptr<net::IOBuffer> write_buffer_; 121 scoped_refptr<net::IOBuffer> write_buffer_;
123 std::string data_; 122 std::string data_;
124 }; 123 };
125 124
126 } // namespace net 125 } // namespace net
127 126
128 #endif // NET_HTTP_DISK_CACHE_BASED_SSL_HOST_INFO_H 127 #endif // NET_HTTP_DISK_CACHE_BASED_SSL_HOST_INFO_H
OLDNEW
« no previous file with comments | « net/base/x509_certificate_mac.cc ('k') | net/ocsp/nss_ocsp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698