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

Unified Diff: components/cronet/android/url_request_context_adapter.h

Issue 624443003: Setup ProxyConfigServiceAndroid in Cronet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: components/cronet/android/url_request_context_adapter.h
diff --git a/components/cronet/android/url_request_context_adapter.h b/components/cronet/android/url_request_context_adapter.h
index b84e036f3cb476e8d70acfa6164c7eef4f94da47..4edff82ac00bd9a8d3a81b87bf5592ad580b0a2f 100644
--- a/components/cronet/android/url_request_context_adapter.h
+++ b/components/cronet/android/url_request_context_adapter.h
@@ -17,6 +17,7 @@
#include "base/threading/thread.h"
#include "net/base/net_log.h"
#include "net/base/network_change_notifier.h"
+#include "net/proxy/proxy_config_service.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
@@ -79,6 +80,8 @@ class URLRequestContextAdapter : public net::URLRequestContextGetter {
void StartNetLogToFile(const std::string& file_name);
void StopNetLog();
+ // Called by main java UI thread to initialize URLRequestContext.
mef 2014/10/10 21:20:37 Called _on_ main...
xunjieli 2014/10/14 19:14:48 Done.
+ void InitRequestContextOnUIThread();
private:
scoped_refptr<URLRequestContextAdapterDelegate> delegate_;
@@ -88,6 +91,8 @@ class URLRequestContextAdapter : public net::URLRequestContextGetter {
scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
scoped_ptr<NetLogObserver> net_log_observer_;
scoped_ptr<net::NetLogLogger> net_log_logger_;
+ scoped_ptr<net::ProxyConfigService> proxy_config_service_;
+ scoped_ptr<URLRequestContextConfig> config_;
// A queue of tasks that need to be run after context has been initialized.
std::queue<RunAfterContextInitTask> tasks_waiting_for_context_;

Powered by Google App Engine
This is Rietveld 408576698