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/cronet_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_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_ 5 #ifndef COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_
6 #define COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_ 6 #define COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <queue> 10 #include <queue>
11 #include <string> 11 #include <string>
12 12
13 #include "base/android/scoped_java_ref.h" 13 #include "base/android/scoped_java_ref.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/threading/thread.h" 18 #include "base/threading/thread.h"
19 19
20 namespace base { 20 namespace base {
21 class SingleThreadTaskRunner; 21 class SingleThreadTaskRunner;
22 } // namespace base 22 } // namespace base
23 23
24 namespace net { 24 namespace net {
25 class NetLogLogger; 25 class WriteToFileNetLogObserver;
26 class URLRequestContext; 26 class URLRequestContext;
27 class ProxyConfigService; 27 class ProxyConfigService;
28 } // namespace net 28 } // namespace net
29 29
30 namespace cronet { 30 namespace cronet {
31 31
32 struct URLRequestContextConfig; 32 struct URLRequestContextConfig;
33 33
34 bool CronetUrlRequestContextAdapterRegisterJni(JNIEnv* env); 34 bool CronetUrlRequestContextAdapterRegisterJni(JNIEnv* env);
35 35
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const; 81 scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const;
82 82
83 void StartNetLogToFileOnNetworkThread(const std::string& file_name); 83 void StartNetLogToFileOnNetworkThread(const std::string& file_name);
84 84
85 void StopNetLogOnNetworkThread(); 85 void StopNetLogOnNetworkThread();
86 86
87 // Network thread is owned by |this|, but is destroyed from java thread. 87 // Network thread is owned by |this|, but is destroyed from java thread.
88 base::Thread* network_thread_; 88 base::Thread* network_thread_;
89 // |net_log_logger_| and |context_| should only be accessed on network thread. 89 // |net_log_logger_| and |context_| should only be accessed on network thread.
90 scoped_ptr<net::NetLogLogger> net_log_logger_; 90 scoped_ptr<net::WriteToFileNetLogObserver> net_log_logger_;
91 scoped_ptr<net::URLRequestContext> context_; 91 scoped_ptr<net::URLRequestContext> context_;
92 scoped_ptr<net::ProxyConfigService> proxy_config_service_; 92 scoped_ptr<net::ProxyConfigService> proxy_config_service_;
93 93
94 // Context config is only valid untng context is initialized. 94 // Context config is only valid untng context is initialized.
95 scoped_ptr<URLRequestContextConfig> context_config_; 95 scoped_ptr<URLRequestContextConfig> context_config_;
96 96
97 // A queue of tasks that need to be run after context has been initialized. 97 // A queue of tasks that need to be run after context has been initialized.
98 std::queue<base::Closure> tasks_waiting_for_context_; 98 std::queue<base::Closure> tasks_waiting_for_context_;
99 bool is_context_initialized_; 99 bool is_context_initialized_;
100 int default_load_flags_; 100 int default_load_flags_;
101 101
102 DISALLOW_COPY_AND_ASSIGN(CronetURLRequestContextAdapter); 102 DISALLOW_COPY_AND_ASSIGN(CronetURLRequestContextAdapter);
103 }; 103 };
104 104
105 } // namespace cronet 105 } // namespace cronet
106 106
107 #endif // COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_ 107 #endif // COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698