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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: remoting/host/ipc_desktop_environment_factory.cc
diff --git a/remoting/host/win/session_desktop_environment_factory.cc b/remoting/host/ipc_desktop_environment_factory.cc
similarity index 62%
copy from remoting/host/win/session_desktop_environment_factory.cc
copy to remoting/host/ipc_desktop_environment_factory.cc
index fda201f7f6247adaec0f1a72929f388a06384837..4b868d9c3407e8460117a92724cd82a680ddd5fd 100644
--- a/remoting/host/win/session_desktop_environment_factory.cc
+++ b/remoting/host/ipc_desktop_environment_factory.cc
@@ -2,37 +2,41 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "remoting/host/win/session_desktop_environment_factory.h"
+#include "remoting/host/ipc_desktop_environment_factory.h"
#include "remoting/host/audio_capturer.h"
#include "remoting/host/chromoting_host_context.h"
-#include "remoting/host/desktop_environment.h"
+#include "remoting/host/daemon_sender.h"
#include "remoting/host/event_executor.h"
+#include "remoting/host/ipc_desktop_environment.h"
#include "remoting/host/video_frame_capturer.h"
#include "remoting/host/win/session_event_executor.h"
namespace remoting {
-SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory(
+IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory(
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
- : DesktopEnvironmentFactory(input_task_runner, ui_task_runner) {
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
+ DaemonSender* daemon_sender)
+ : DesktopEnvironmentFactory(input_task_runner, ui_task_runner),
+ daemon_sender_(daemon_sender) {
}
-SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() {
+IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {
}
-scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create() {
+scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create() {
scoped_ptr<AudioCapturer> audio_capturer = AudioCapturer::Create();
scoped_ptr<EventExecutor> event_executor = EventExecutor::Create(
input_task_runner_, ui_task_runner_);
event_executor.reset(new SessionEventExecutorWin(
input_task_runner_, event_executor.Pass()));
scoped_ptr<VideoFrameCapturer> video_capturer(VideoFrameCapturer::Create());
- return scoped_ptr<DesktopEnvironment>(new DesktopEnvironment(
+ return scoped_ptr<DesktopEnvironment>(new IpcDesktopEnvironment(
audio_capturer.Pass(),
event_executor.Pass(),
- video_capturer.Pass()));
+ video_capturer.Pass(),
+ daemon_sender_));
}
} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698