OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // This file implements a standalone host process for Me2Me. | 5 // This file implements a standalone host process for Me2Me. |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/at_exit.h" | 9 #include "base/at_exit.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 daemon_channel_.reset(new IPC::ChannelProxy( | 336 daemon_channel_.reset(new IPC::ChannelProxy( |
337 channel_handle, | 337 channel_handle, |
338 IPC::Channel::MODE_CLIENT, | 338 IPC::Channel::MODE_CLIENT, |
339 this, | 339 this, |
340 context_->network_task_runner())); | 340 context_->network_task_runner())); |
341 #else // !defined(REMOTING_MULTI_PROCESS) | 341 #else // !defined(REMOTING_MULTI_PROCESS) |
342 // Connect to the daemon process. | 342 // Connect to the daemon process. |
343 std::string channel_name = | 343 std::string channel_name = |
344 cmd_line->GetSwitchValueASCII(kDaemonPipeSwitchName); | 344 cmd_line->GetSwitchValueASCII(kDaemonPipeSwitchName); |
345 if (!channel_name.empty()) { | 345 if (!channel_name.empty()) { |
346 daemon_channel_.reset(new IPC::ChannelProxy( | 346 daemon_channel_.reset( |
347 channel_name, IPC::Channel::MODE_CLIENT, this, | 347 new IPC::ChannelProxy(channel_name, |
348 context_->network_task_runner())); | 348 IPC::Channel::MODE_CLIENT, |
| 349 this, |
| 350 context_->network_task_runner().get())); |
349 } | 351 } |
350 | 352 |
351 base::FilePath default_config_dir = remoting::GetConfigDir(); | 353 base::FilePath default_config_dir = remoting::GetConfigDir(); |
352 host_config_path_ = default_config_dir.Append(kDefaultHostConfigFile); | 354 host_config_path_ = default_config_dir.Append(kDefaultHostConfigFile); |
353 if (cmd_line->HasSwitch(kHostConfigSwitchName)) { | 355 if (cmd_line->HasSwitch(kHostConfigSwitchName)) { |
354 host_config_path_ = cmd_line->GetSwitchValuePath(kHostConfigSwitchName); | 356 host_config_path_ = cmd_line->GetSwitchValuePath(kHostConfigSwitchName); |
355 } | 357 } |
356 #endif // !defined(REMOTING_MULTI_PROCESS) | 358 #endif // !defined(REMOTING_MULTI_PROCESS) |
357 | 359 |
358 ServiceUrls* service_urls = ServiceUrls::GetInstance(); | 360 ServiceUrls* service_urls = ServiceUrls::GetInstance(); |
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1077 return exit_code; | 1079 return exit_code; |
1078 } | 1080 } |
1079 | 1081 |
1080 } // namespace remoting | 1082 } // namespace remoting |
1081 | 1083 |
1082 #if !defined(OS_WIN) | 1084 #if !defined(OS_WIN) |
1083 int main(int argc, char** argv) { | 1085 int main(int argc, char** argv) { |
1084 return remoting::HostMain(argc, argv); | 1086 return remoting::HostMain(argc, argv); |
1085 } | 1087 } |
1086 #endif // !defined(OS_WIN) | 1088 #endif // !defined(OS_WIN) |
OLD | NEW |