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

Unified Diff: remoting/host/setup/me2me_native_messaging_host_main.cc

Issue 542473002: Uses ProxyConfigServiceLinux in the chromoting host to configure proxy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « remoting/host/chromoting_host_context.cc ('k') | remoting/host/setup/start_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/setup/me2me_native_messaging_host_main.cc
diff --git a/remoting/host/setup/me2me_native_messaging_host_main.cc b/remoting/host/setup/me2me_native_messaging_host_main.cc
index 530987987571bcc2d845f6d7f8bf7a900caf0464..903d0712c87a4d02ca1e5229e871a3233e44581c 100644
--- a/remoting/host/setup/me2me_native_messaging_host_main.cc
+++ b/remoting/host/setup/me2me_native_messaging_host_main.cc
@@ -86,6 +86,10 @@ int StartMe2MeNativeMessagingHost() {
io_thread.StartWithOptions(
base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
+ base::Thread file_thread("file_thread");
+ file_thread.StartWithOptions(
+ base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
+
base::MessageLoopForUI message_loop;
base::RunLoop run_loop;
@@ -174,9 +178,10 @@ int StartMe2MeNativeMessagingHost() {
#error Not implemented.
#endif
- // OAuth client (for credential requests).
+ // OAuth client (for credential requests). IO thread is used for blocking
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter(
- new URLRequestContextGetter(io_thread.message_loop_proxy()));
+ new URLRequestContextGetter(io_thread.task_runner(),
+ file_thread.task_runner()));
scoped_ptr<OAuthClient> oauth_client(
new OAuthClient(url_request_context_getter));
@@ -225,11 +230,11 @@ int StartMe2MeNativeMessagingHost() {
return kInitializationFailed;
pairing_registry = new PairingRegistry(
- io_thread.message_loop_proxy(),
+ io_thread.task_runner(),
delegate.PassAs<PairingRegistry::Delegate>());
#else // defined(OS_WIN)
pairing_registry =
- CreatePairingRegistry(io_thread.message_loop_proxy());
+ CreatePairingRegistry(io_thread.task_runner());
#endif // !defined(OS_WIN)
// Set up the native messaging channel.
« no previous file with comments | « remoting/host/chromoting_host_context.cc ('k') | remoting/host/setup/start_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698