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

Side by Side Diff: components/cronet/android/url_request_context_adapter.h

Issue 1084533002: Rename NetLogLogger and CapturingNetLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename NetLogLogger and CapturingNetLog(removed compiler error for chromeOS) Created 5 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 COMPONENTS_CRONET_ANDROID_URL_REQUEST_CONTEXT_ADAPTER_H_ 5 #ifndef COMPONENTS_CRONET_ANDROID_URL_REQUEST_CONTEXT_ADAPTER_H_
6 #define COMPONENTS_CRONET_ANDROID_URL_REQUEST_CONTEXT_ADAPTER_H_ 6 #define COMPONENTS_CRONET_ANDROID_URL_REQUEST_CONTEXT_ADAPTER_H_
7 7
8 #include <queue> 8 #include <queue>
9 #include <string> 9 #include <string>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
18 #include "net/log/net_log.h" 18 #include "net/log/net_log.h"
19 #include "net/url_request/url_request_context.h" 19 #include "net/url_request/url_request_context.h"
20 #include "net/url_request/url_request_context_getter.h" 20 #include "net/url_request/url_request_context_getter.h"
21 21
22 namespace net { 22 namespace net {
23 23
24 class NetLogLogger; 24 class WriteToFileNetLogObserver;
25 25
26 class ProxyConfigService; 26 class ProxyConfigService;
27 27
28 } // namespace net 28 } // namespace net
29 29
30 namespace cronet { 30 namespace cronet {
31 31
32 struct URLRequestContextConfig; 32 struct URLRequestContextConfig;
33 typedef base::Callback<void(void)> RunAfterContextInitTask; 33 typedef base::Callback<void(void)> RunAfterContextInitTask;
34 34
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // Helper function to stop writing NetLog data to file. This should only be 100 // Helper function to stop writing NetLog data to file. This should only be
101 // run after context is initialized. 101 // run after context is initialized.
102 void StopNetLogHelper(); 102 void StopNetLogHelper();
103 103
104 scoped_refptr<URLRequestContextAdapterDelegate> delegate_; 104 scoped_refptr<URLRequestContextAdapterDelegate> delegate_;
105 scoped_ptr<net::URLRequestContext> context_; 105 scoped_ptr<net::URLRequestContext> context_;
106 std::string user_agent_; 106 std::string user_agent_;
107 bool load_disable_cache_; 107 bool load_disable_cache_;
108 base::Thread* network_thread_; 108 base::Thread* network_thread_;
109 scoped_ptr<NetLogObserver> net_log_observer_; 109 scoped_ptr<NetLogObserver> net_log_observer_;
110 scoped_ptr<net::NetLogLogger> net_log_logger_; 110 scoped_ptr<net::WriteToFileNetLogObserver> net_log_logger_;
111 scoped_ptr<net::ProxyConfigService> proxy_config_service_; 111 scoped_ptr<net::ProxyConfigService> proxy_config_service_;
112 scoped_ptr<URLRequestContextConfig> config_; 112 scoped_ptr<URLRequestContextConfig> config_;
113 113
114 // A queue of tasks that need to be run after context has been initialized. 114 // A queue of tasks that need to be run after context has been initialized.
115 std::queue<RunAfterContextInitTask> tasks_waiting_for_context_; 115 std::queue<RunAfterContextInitTask> tasks_waiting_for_context_;
116 bool is_context_initialized_; 116 bool is_context_initialized_;
117 117
118 DISALLOW_COPY_AND_ASSIGN(URLRequestContextAdapter); 118 DISALLOW_COPY_AND_ASSIGN(URLRequestContextAdapter);
119 }; 119 };
120 120
121 } // namespace cronet 121 } // namespace cronet
122 122
123 #endif // COMPONENTS_CRONET_ANDROID_URL_REQUEST_CONTEXT_ADAPTER_H_ 123 #endif // COMPONENTS_CRONET_ANDROID_URL_REQUEST_CONTEXT_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698