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

Side by Side Diff: remoting/host/it2me/it2me_native_messaging_host_main.cc

Issue 637463002: Revert "Remote Assistance on Chrome OS Part III - NativeMessageHost" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "remoting/host/it2me/it2me_native_messaging_host_main.h" 5 #include "remoting/host/it2me/it2me_native_messaging_host_main.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/i18n/icu_util.h" 9 #include "base/i18n/icu_util.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "media/base/media.h" 12 #include "media/base/media.h"
13 #include "net/socket/ssl_server_socket.h" 13 #include "net/socket/ssl_server_socket.h"
14 #include "remoting/base/breakpad.h" 14 #include "remoting/base/breakpad.h"
15 #include "remoting/base/resources.h" 15 #include "remoting/base/resources.h"
16 #include "remoting/host/host_exit_codes.h" 16 #include "remoting/host/host_exit_codes.h"
17 #include "remoting/host/it2me/it2me_native_messaging_host.h" 17 #include "remoting/host/it2me/it2me_native_messaging_host.h"
18 #include "remoting/host/logging.h" 18 #include "remoting/host/logging.h"
19 #include "remoting/host/native_messaging/native_messaging_pipe.h"
20 #include "remoting/host/native_messaging/pipe_messaging_channel.h" 19 #include "remoting/host/native_messaging/pipe_messaging_channel.h"
21 #include "remoting/host/usage_stats_consent.h" 20 #include "remoting/host/usage_stats_consent.h"
22 21
23 #if defined(OS_LINUX) 22 #if defined(OS_LINUX)
24 #include <gtk/gtk.h> 23 #include <gtk/gtk.h>
25 #include <X11/Xlib.h> 24 #include <X11/Xlib.h>
26 #endif // defined(OS_LINUX) 25 #endif // defined(OS_LINUX)
27 26
28 #if defined(OS_MACOSX) 27 #if defined(OS_MACOSX)
29 #include "base/mac/scoped_nsautorelease_pool.h" 28 #include "base/mac/scoped_nsautorelease_pool.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 110
112 base::MessageLoopForUI message_loop; 111 base::MessageLoopForUI message_loop;
113 base::RunLoop run_loop; 112 base::RunLoop run_loop;
114 113
115 scoped_refptr<AutoThreadTaskRunner> task_runner = 114 scoped_refptr<AutoThreadTaskRunner> task_runner =
116 new remoting::AutoThreadTaskRunner(message_loop.message_loop_proxy(), 115 new remoting::AutoThreadTaskRunner(message_loop.message_loop_proxy(),
117 run_loop.QuitClosure()); 116 run_loop.QuitClosure());
118 117
119 scoped_ptr<It2MeHostFactory> factory(new It2MeHostFactory()); 118 scoped_ptr<It2MeHostFactory> factory(new It2MeHostFactory());
120 119
121 scoped_ptr<NativeMessagingPipe> native_messaging_pipe(
122 new NativeMessagingPipe());
123
124 // Set up the native messaging channel. 120 // Set up the native messaging channel.
125 scoped_ptr<extensions::NativeMessagingChannel> channel( 121 scoped_ptr<extensions::NativeMessagingChannel> channel(
126 new PipeMessagingChannel(read_file.Pass(), write_file.Pass())); 122 new PipeMessagingChannel(read_file.Pass(), write_file.Pass()));
127 123
128 scoped_ptr<extensions::NativeMessageHost> host(new It2MeNativeMessagingHost( 124 scoped_ptr<It2MeNativeMessagingHost> host(new It2MeNativeMessagingHost(
129 task_runner, 125 task_runner, channel.Pass(), factory.Pass()));
130 factory.Pass())); 126 host->Start(run_loop.QuitClosure());
131
132 host->Start(native_messaging_pipe.get());
133
134 native_messaging_pipe->Start(
135 host.Pass(), channel.Pass(), run_loop.QuitClosure());
136 127
137 // Run the loop until channel is alive. 128 // Run the loop until channel is alive.
138 run_loop.Run(); 129 run_loop.Run();
139 130
140 return kSuccessExitCode; 131 return kSuccessExitCode;
141 } 132 }
142 133
143 int It2MeNativeMessagingHostMain(int argc, char** argv) { 134 int It2MeNativeMessagingHostMain(int argc, char** argv) {
144 // This object instance is required by Chrome code (such as MessageLoop). 135 // This object instance is required by Chrome code (such as MessageLoop).
145 base::AtExitManager exit_manager; 136 base::AtExitManager exit_manager;
146 137
147 base::CommandLine::Init(argc, argv); 138 base::CommandLine::Init(argc, argv);
148 remoting::InitHostLogging(); 139 remoting::InitHostLogging();
149 140
150 return StartIt2MeNativeMessagingHost(); 141 return StartIt2MeNativeMessagingHost();
151 } 142 }
152 143
153 } // namespace remoting 144 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/it2me/it2me_native_messaging_host.cc ('k') | remoting/host/it2me/it2me_native_messaging_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698