| 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 "remoting/host/remoting_me2me_host.h" | 7 #include "remoting/host/remoting_me2me_host.h" | 
| 8 | 8 | 
| 9 #include <string> | 9 #include <string> | 
| 10 | 10 | 
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 586 #endif  // defined(OS_LINUX) | 586 #endif  // defined(OS_LINUX) | 
| 587 | 587 | 
| 588   // Create a desktop environment factory appropriate to the build type & | 588   // Create a desktop environment factory appropriate to the build type & | 
| 589   // platform. | 589   // platform. | 
| 590 #if defined(OS_WIN) | 590 #if defined(OS_WIN) | 
| 591 | 591 | 
| 592 #if defined(REMOTING_MULTI_PROCESS) | 592 #if defined(REMOTING_MULTI_PROCESS) | 
| 593   IpcDesktopEnvironmentFactory* desktop_environment_factory = | 593   IpcDesktopEnvironmentFactory* desktop_environment_factory = | 
| 594       new IpcDesktopEnvironmentFactory( | 594       new IpcDesktopEnvironmentFactory( | 
| 595           context_->network_task_runner(), | 595           context_->network_task_runner(), | 
|  | 596           context_->network_task_runner(), | 
| 596           daemon_channel_.get()); | 597           daemon_channel_.get()); | 
| 597   desktop_session_connector_ = desktop_environment_factory; | 598   desktop_session_connector_ = desktop_environment_factory; | 
| 598 #else // !defined(REMOTING_MULTI_PROCESS) | 599 #else // !defined(REMOTING_MULTI_PROCESS) | 
| 599   DesktopEnvironmentFactory* desktop_environment_factory = | 600   DesktopEnvironmentFactory* desktop_environment_factory = | 
| 600       new SessionDesktopEnvironmentFactory( | 601       new SessionDesktopEnvironmentFactory( | 
| 601           base::Bind(&HostProcess::SendSasToConsole, this)); | 602           base::Bind(&HostProcess::SendSasToConsole, this)); | 
| 602 #endif  // !defined(REMOTING_MULTI_PROCESS) | 603 #endif  // !defined(REMOTING_MULTI_PROCESS) | 
| 603 | 604 | 
| 604 #else  // !defined(OS_WIN) | 605 #else  // !defined(OS_WIN) | 
| 605   DesktopEnvironmentFactory* desktop_environment_factory = | 606   DesktopEnvironmentFactory* desktop_environment_factory = | 
| (...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1150   return exit_code; | 1151   return exit_code; | 
| 1151 } | 1152 } | 
| 1152 | 1153 | 
| 1153 }  // namespace remoting | 1154 }  // namespace remoting | 
| 1154 | 1155 | 
| 1155 #if !defined(OS_WIN) | 1156 #if !defined(OS_WIN) | 
| 1156 int main(int argc, char** argv) { | 1157 int main(int argc, char** argv) { | 
| 1157   return remoting::HostProcessMain(argc, argv); | 1158   return remoting::HostProcessMain(argc, argv); | 
| 1158 } | 1159 } | 
| 1159 #endif  // !defined(OS_WIN) | 1160 #endif  // !defined(OS_WIN) | 
| OLD | NEW | 
|---|