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

Side by Side Diff: remoting/host/remoting_me2me_host.cc

Issue 12096071: Adding a unit test to verify the IPC channel between the network and desktop processes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
OLDNEW
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 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 #endif // defined(OS_LINUX) 570 #endif // defined(OS_LINUX)
571 571
572 // Create a desktop environment factory appropriate to the build type & 572 // Create a desktop environment factory appropriate to the build type &
573 // platform. 573 // platform.
574 #if defined(OS_WIN) 574 #if defined(OS_WIN)
575 575
576 #if defined(REMOTING_MULTI_PROCESS) 576 #if defined(REMOTING_MULTI_PROCESS)
577 IpcDesktopEnvironmentFactory* desktop_environment_factory = 577 IpcDesktopEnvironmentFactory* desktop_environment_factory =
578 new IpcDesktopEnvironmentFactory( 578 new IpcDesktopEnvironmentFactory(
579 context_->network_task_runner(), 579 context_->network_task_runner(),
580 context_->network_task_runner(),
580 daemon_channel_.get()); 581 daemon_channel_.get());
581 desktop_session_connector_ = desktop_environment_factory; 582 desktop_session_connector_ = desktop_environment_factory;
582 #else // !defined(REMOTING_MULTI_PROCESS) 583 #else // !defined(REMOTING_MULTI_PROCESS)
583 DesktopEnvironmentFactory* desktop_environment_factory = 584 DesktopEnvironmentFactory* desktop_environment_factory =
584 new SessionDesktopEnvironmentFactory( 585 new SessionDesktopEnvironmentFactory(
585 base::Bind(&HostProcess::SendSasToConsole, this)); 586 base::Bind(&HostProcess::SendSasToConsole, this));
586 #endif // !defined(REMOTING_MULTI_PROCESS) 587 #endif // !defined(REMOTING_MULTI_PROCESS)
587 588
588 #else // !defined(OS_WIN) 589 #else // !defined(OS_WIN)
589 DesktopEnvironmentFactory* desktop_environment_factory = 590 DesktopEnvironmentFactory* desktop_environment_factory =
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 return exit_code; 1134 return exit_code;
1134 } 1135 }
1135 1136
1136 } // namespace remoting 1137 } // namespace remoting
1137 1138
1138 #if !defined(OS_WIN) 1139 #if !defined(OS_WIN)
1139 int main(int argc, char** argv) { 1140 int main(int argc, char** argv) {
1140 return remoting::HostProcessMain(argc, argv); 1141 return remoting::HostProcessMain(argc, argv);
1141 } 1142 }
1142 #endif // !defined(OS_WIN) 1143 #endif // !defined(OS_WIN)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698