diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 23:15:32 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 23:15:32 +0000 |
commit | 9bf0b36044584756132943f37a06f2fcaef7e5fb (patch) | |
tree | 6e7f6e0c831372cb1fee518bc9166c0c4331ed96 /net/proxy/proxy_config_service_linux.h | |
parent | bb4628ae89c01f3ed942a24405a56f58cfbee68a (diff) | |
download | chromium_src-9bf0b36044584756132943f37a06f2fcaef7e5fb.zip chromium_src-9bf0b36044584756132943f37a06f2fcaef7e5fb.tar.gz chromium_src-9bf0b36044584756132943f37a06f2fcaef7e5fb.tar.bz2 |
Revert 206507 "Move message_pump to base/message_loop."
> Move message_pump to base/message_loop.
>
> This also fixes some namespace usage inside the message pump files and updates all users of these files to use the new location.
>
> BUG=
> R=sky@chromium.org
>
> Review URL: https://codereview.chromium.org/17078005
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/16897005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_linux.h')
-rw-r--r-- | net/proxy/proxy_config_service_linux.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h index 5dccd9d..8bae4c8 100644 --- a/net/proxy/proxy_config_service_linux.h +++ b/net/proxy/proxy_config_service_linux.h @@ -251,14 +251,13 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService { ProxyConfig reference_config_; // The task runner for the glib thread, aka main browser thread. This thread - // is where we run the glib main loop (see - // base/message_loop/message_pump_glib.h). It is the glib default loop in - // the sense that it runs the glib default context: as in the context where - // sources are added by g_timeout_add and g_idle_add, and returned by - // g_main_context_default. gconf uses glib timeouts and idles and possibly - // other callbacks that will all be dispatched on this thread. Since gconf - // is not thread safe, any use of gconf must be done on the thread running - // this loop. + // is where we run the glib main loop (see base/message_pump_glib.h). It is + // the glib default loop in the sense that it runs the glib default context: + // as in the context where sources are added by g_timeout_add and + // g_idle_add, and returned by g_main_context_default. gconf uses glib + // timeouts and idles and possibly other callbacks that will all be + // dispatched on this thread. Since gconf is not thread safe, any use of + // gconf must be done on the thread running this loop. scoped_refptr<base::SingleThreadTaskRunner> glib_thread_task_runner_; // Task runner for the IO thread. GetLatestProxyConfig() is called from // the thread running this loop. |