summaryrefslogtreecommitdiffstats
path: root/remoting/host/simple_host_process.cc
diff options
context:
space:
mode:
authorlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-23 11:33:59 +0000
committerlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-23 11:33:59 +0000
commit1fdc9df1779d7ff34aee4f232de54df4da69b8e1 (patch)
tree234a75bd17d6df73246cdc9f2fa5e6189878be2d /remoting/host/simple_host_process.cc
parent9ad40af577d006d324e2edebbeece0c6053f14cc (diff)
downloadchromium_src-1fdc9df1779d7ff34aee4f232de54df4da69b8e1.zip
chromium_src-1fdc9df1779d7ff34aee4f232de54df4da69b8e1.tar.gz
chromium_src-1fdc9df1779d7ff34aee4f232de54df4da69b8e1.tar.bz2
Add DesktopEnvironment class and refactor.
BUG=none TEST=It builds and runs Review URL: http://codereview.chromium.org/6541018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/simple_host_process.cc')
-rw-r--r--remoting/host/simple_host_process.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 5903489..d979e83 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -32,6 +32,7 @@
#include "remoting/host/capturer_fake.h"
#include "remoting/host/chromoting_host.h"
#include "remoting/host/chromoting_host_context.h"
+#include "remoting/host/desktop_environment.h"
#include "remoting/host/event_executor.h"
#include "remoting/host/json_host_config.h"
#include "remoting/proto/video.pb.h"
@@ -41,6 +42,7 @@
#endif
using remoting::ChromotingHost;
+using remoting::DesktopEnvironment;
using remoting::protocol::CandidateSessionConfig;
using remoting::protocol::ChannelConfig;
using std::string;
@@ -130,7 +132,7 @@ int main(int argc, char** argv) {
remoting::protocol::InputStub* input_stub =
CreateEventExecutor(context.ui_message_loop(), capturer);
host = ChromotingHost::Create(
- &context, config, capturer, input_stub);
+ &context, config, new DesktopEnvironment(capturer, input_stub));
} else {
host = ChromotingHost::Create(&context, config);
}