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

Side by Side Diff: android_webview/browser/net/aw_url_request_context_getter.h

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cookies_list.js Created 6 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
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 ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
6 #define ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_ 6 #define ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "content/public/browser/content_browser_client.h" 12 #include "content/public/browser/content_browser_client.h"
13 #include "net/http/http_network_session.h" 13 #include "net/http/http_network_session.h"
14 #include "net/ssl/server_bound_cert_service.h" 14 #include "net/ssl/channel_id_service.h"
15 #include "net/url_request/url_request_context_getter.h" 15 #include "net/url_request/url_request_context_getter.h"
16 #include "net/url_request/url_request_job_factory.h" 16 #include "net/url_request/url_request_job_factory.h"
17 17
18 namespace net { 18 namespace net {
19 class CookieStore; 19 class CookieStore;
20 class HttpTransactionFactory; 20 class HttpTransactionFactory;
21 class ProxyConfigService; 21 class ProxyConfigService;
22 class URLRequestContext; 22 class URLRequestContext;
23 class URLRequestJobFactory; 23 class URLRequestJobFactory;
24 } 24 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 content::URLRequestInterceptorScopedVector request_interceptors); 62 content::URLRequestInterceptorScopedVector request_interceptors);
63 63
64 void InitializeURLRequestContext(); 64 void InitializeURLRequestContext();
65 65
66 const base::FilePath partition_path_; 66 const base::FilePath partition_path_;
67 scoped_refptr<net::CookieStore> cookie_store_; 67 scoped_refptr<net::CookieStore> cookie_store_;
68 scoped_ptr<net::URLRequestContext> url_request_context_; 68 scoped_ptr<net::URLRequestContext> url_request_context_;
69 scoped_ptr<DataReductionProxyConfigService> proxy_config_service_; 69 scoped_ptr<DataReductionProxyConfigService> proxy_config_service_;
70 scoped_ptr<net::URLRequestJobFactory> job_factory_; 70 scoped_ptr<net::URLRequestJobFactory> job_factory_;
71 scoped_ptr<net::HttpTransactionFactory> main_http_factory_; 71 scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
72 scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; 72 scoped_ptr<net::ChannelIDService> channel_id_service_;
73 73
74 // ProtocolHandlers and interceptors are stored here between 74 // ProtocolHandlers and interceptors are stored here between
75 // SetHandlersAndInterceptors() and the first GetURLRequestContext() call. 75 // SetHandlersAndInterceptors() and the first GetURLRequestContext() call.
76 content::ProtocolHandlerMap protocol_handlers_; 76 content::ProtocolHandlerMap protocol_handlers_;
77 content::URLRequestInterceptorScopedVector request_interceptors_; 77 content::URLRequestInterceptorScopedVector request_interceptors_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(AwURLRequestContextGetter); 79 DISALLOW_COPY_AND_ASSIGN(AwURLRequestContextGetter);
80 }; 80 };
81 81
82 } // namespace android_webview 82 } // namespace android_webview
83 83
84 #endif // ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_ 84 #endif // ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698