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

Unified Diff: remoting/host/simple_host_process.cc

Issue 8725016: Refactor IT2Me-specific functions into a HostObserver subclass. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix other nits. Created 9 years, 1 month 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/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 99af0712cf96d60d4fa5de56a2390a1722bfe01a..2e07cc465cfc027d7ca4d034c9f0b12fc07ed2ad 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -35,13 +35,10 @@
#include "remoting/host/capturer_fake.h"
#include "remoting/host/chromoting_host.h"
#include "remoting/host/chromoting_host_context.h"
-#include "remoting/host/continue_window.h"
-#include "remoting/host/curtain.h"
#include "remoting/host/desktop_environment.h"
-#include "remoting/host/disconnect_window.h"
#include "remoting/host/event_executor.h"
#include "remoting/host/heartbeat_sender.h"
-#include "remoting/host/local_input_monitor.h"
+#include "remoting/host/it2me_host_user_interface.h"
#include "remoting/host/log_to_server.h"
#include "remoting/host/json_host_config.h"
#include "remoting/host/register_support_host_request.h"
@@ -63,6 +60,7 @@ using remoting::ChromotingHost;
using remoting::DesktopEnvironment;
using remoting::kChromotingTokenDefaultServiceName;
using remoting::kXmppAuthServiceConfigPath;
+using remoting::It2MeHostUserInterface;
using remoting::protocol::CandidateSessionConfig;
using remoting::protocol::ChannelConfig;
using std::string;
@@ -166,17 +164,8 @@ class SimpleHost {
remoting::EventExecutor* event_executor =
remoting::EventExecutor::Create(context.desktop_message_loop(),
capturer);
- remoting::Curtain* curtain = remoting::Curtain::Create();
- remoting::DisconnectWindow* disconnect_window =
- remoting::DisconnectWindow::Create();
- remoting::ContinueWindow* continue_window =
- remoting::ContinueWindow::Create();
- remoting::LocalInputMonitor* local_input_monitor =
- remoting::LocalInputMonitor::Create();
desktop_environment.reset(
- new DesktopEnvironment(&context, capturer, event_executor, curtain,
- disconnect_window, continue_window,
- local_input_monitor));
+ new DesktopEnvironment(&context, capturer, event_executor));
} else {
desktop_environment.reset(DesktopEnvironment::Create(&context));
}
@@ -185,6 +174,14 @@ class SimpleHost {
access_verifier.release(), false);
host_->set_it2me(is_it2me_);
+ scoped_ptr<It2MeHostUserInterface> it2me_host_user_interface;
+ if (is_it2me_) {
+ it2me_host_user_interface.reset(new It2MeHostUserInterface(host_,
+ &context));
+ it2me_host_user_interface->Init();
+ host_->AddStatusObserver(it2me_host_user_interface.get());
+ }
+
if (protocol_config_.get()) {
host_->set_protocol_config(protocol_config_.release());
}

Powered by Google App Engine
This is Rietveld 408576698