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

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

Issue 11028128: [Chromoting] Request the daemon to open a terminal once a connection has been accepted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | 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 #include "remoting/host/win/session_desktop_environment_factory.h" 5 #include "remoting/host/ipc_desktop_environment_factory.h"
6 6
7 #include "remoting/host/audio_capturer.h" 7 #include "remoting/host/audio_capturer.h"
8 #include "remoting/host/chromoting_host_context.h" 8 #include "remoting/host/chromoting_host_context.h"
9 #include "remoting/host/desktop_environment.h" 9 #include "remoting/host/daemon_sender.h"
10 #include "remoting/host/event_executor.h" 10 #include "remoting/host/event_executor.h"
11 #include "remoting/host/ipc_desktop_environment.h"
11 #include "remoting/host/video_frame_capturer.h" 12 #include "remoting/host/video_frame_capturer.h"
12 #include "remoting/host/win/session_event_executor.h" 13 #include "remoting/host/win/session_event_executor.h"
13 14
14 namespace remoting { 15 namespace remoting {
15 16
16 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( 17 IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory(
17 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 18 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
18 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 19 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
19 : DesktopEnvironmentFactory(input_task_runner, ui_task_runner) { 20 DaemonSender* daemon_sender)
21 : DesktopEnvironmentFactory(input_task_runner, ui_task_runner),
22 daemon_sender_(daemon_sender) {
20 } 23 }
21 24
22 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() { 25 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {
23 } 26 }
24 27
25 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create() { 28 scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create() {
26 scoped_ptr<AudioCapturer> audio_capturer = AudioCapturer::Create(); 29 scoped_ptr<AudioCapturer> audio_capturer = AudioCapturer::Create();
27 scoped_ptr<EventExecutor> event_executor = EventExecutor::Create( 30 scoped_ptr<EventExecutor> event_executor = EventExecutor::Create(
28 input_task_runner_, ui_task_runner_); 31 input_task_runner_, ui_task_runner_);
29 event_executor.reset(new SessionEventExecutorWin( 32 event_executor.reset(new SessionEventExecutorWin(
30 input_task_runner_, event_executor.Pass())); 33 input_task_runner_, event_executor.Pass()));
31 scoped_ptr<VideoFrameCapturer> video_capturer(VideoFrameCapturer::Create()); 34 scoped_ptr<VideoFrameCapturer> video_capturer(VideoFrameCapturer::Create());
32 return scoped_ptr<DesktopEnvironment>(new DesktopEnvironment( 35 return scoped_ptr<DesktopEnvironment>(new IpcDesktopEnvironment(
33 audio_capturer.Pass(), 36 audio_capturer.Pass(),
34 event_executor.Pass(), 37 event_executor.Pass(),
35 video_capturer.Pass())); 38 video_capturer.Pass(),
39 daemon_sender_));
36 } 40 }
37 41
38 } // namespace remoting 42 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698