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

Unified Diff: chrome/browser/io_thread.h

Issue 10912132: Move ProxyConfigService construction onto the IO thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove extra blank line Created 8 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: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 6e0699cbe5a9be9bd3892ce1eb86aad9e55a1717..d8b8fbea7307a784d78d4c75f31460302af40709 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -19,6 +19,7 @@
#include "net/base/network_change_notifier.h"
class ChromeNetLog;
+class ChromeProxyConfigService;
class PrefProxyConfigTrackerImpl;
class PrefService;
class SystemURLRequestContextGetter;
@@ -43,7 +44,6 @@ class HttpServerProperties;
class HttpTransactionFactory;
class NetworkDelegate;
class ServerBoundCertService;
-class ProxyConfigService;
class ProxyService;
class SdchManager;
class SSLConfigService;
@@ -144,6 +144,11 @@ class IOThread : public content::BrowserThreadDelegate {
// called on the IO thread.
void ClearHostCache();
+ // Called on the UI thread to indicate now is the time for shutdown work that
willchan no longer on Chromium 2012/10/19 18:06:36 Can you explain why this hook needs to exist? Why
pauljensen 2012/10/19 22:34:28 ~IOThread() is called after every thread except th
+ // must occur on the UI thread. Its also one of the last safe times to post
+ // shutdown tasks to other browser threads.
+ void StartTearDown();
+
private:
// BrowserThreadDelegate implementation, runs on the IO thread.
// This handles initialization and destruction of state that must
@@ -212,12 +217,12 @@ class IOThread : public content::BrowserThreadDelegate {
// platform and it gets SSL preferences from local_state object.
scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
- // These member variables are initialized by a task posted to the IO thread,
- // which gets posted by calling certain member functions of IOThread.
- scoped_ptr<net::ProxyConfigService> system_proxy_config_service_;
+ scoped_ptr<ChromeProxyConfigService> system_proxy_config_service_;
scoped_ptr<PrefProxyConfigTrackerImpl> pref_proxy_config_tracker_;
+ // This member variable is initialized by a task posted to the IO thread,
+ // which gets posted by calling certain member functions of IOThread.
scoped_refptr<net::URLRequestContextGetter>
system_url_request_context_getter_;

Powered by Google App Engine
This is Rietveld 408576698