Refactor IT2Me-specific functions into a HostObserver subclass.

remoting/host/simple_host_process.cc

 // 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.
 //
 // This is an application of a minimal host process in a Chromoting
 // system. It serves the purpose of gluing different pieces together
 // to make a functional host process for testing.
 //
 // It peforms the following functionality:
 // 1. Connect to the GTalk network and register the machine as a host.
@@ skipping 17 matching lines @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/test/mock_chrome_application_mac.h"
 #include "base/threading/thread.h"
 #include "crypto/nss_util.h"
 #include "remoting/base/constants.h"
 #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_observer.h"
 #include "remoting/host/log_to_server.h"
 #include "remoting/host/json_host_config.h"
 #include "remoting/host/register_support_host_request.h"
 #include "remoting/host/self_access_verifier.h"
 #include "remoting/host/support_access_verifier.h"
 #include "remoting/proto/video.pb.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "ui/gfx/gtk_util.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #elif defined(OS_WIN)
 // TODO(garykac) Make simple host into a proper GUI app on Windows so that we
 // have an hModule for the dialog resource.
 HMODULE g_hModule = NULL;
 #endif
 
 using remoting::ChromotingHost;
 using remoting::DesktopEnvironment;
 using remoting::kChromotingTokenDefaultServiceName;
 using remoting::kXmppAuthServiceConfigPath;
+using remoting::It2MeObserver;
 using remoting::protocol::CandidateSessionConfig;
 using remoting::protocol::ChannelConfig;
 using std::string;
 using std::wstring;
 
 #if defined(OS_WIN)
 const wchar_t kDefaultConfigPath[] = L".ChromotingConfig.json";
 const wchar_t kHomeDrive[] = L"HOMEDRIVE";
 const wchar_t kHomePath[] = L"HOMEPATH";
 // TODO(sergeyu): Use environment utils from base/environment.h.
@@ skipping 84 matching lines @@
 
     // Construct a chromoting host.
     scoped_ptr<DesktopEnvironment> desktop_environment;
     if (fake_) {
       remoting::Capturer* capturer =
           new remoting::CapturerFake();
       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, curtain));
     } else {
       desktop_environment.reset(DesktopEnvironment::Create(&context));
     }
 
     host_ = ChromotingHost::Create(&context, config, desktop_environment.get(),
                                    access_verifier.release(), false);
     host_->set_it2me(is_it2me_);
 
+    scoped_ptr<It2MeObserver> it2me_observer;
+    if (is_it2me_) {
+      it2me_observer.reset(new It2MeObserver(host_, &context));
+      it2me_observer->Init();
+      host_->AddStatusObserver(it2me_observer.get());
+    }
+
     if (protocol_config_.get()) {
       host_->set_protocol_config(protocol_config_.release());
     }
 
     if (is_it2me_) {
       host_->AddStatusObserver(register_request.get());
     } else {
       // Initialize HeartbeatSender.
       heartbeat_sender.reset(
           new remoting::HeartbeatSender(context.network_message_loop(),
@@ skipping 113 matching lines @@
       LOG(ERROR) << "Unknown video codec: " << video_codec;
       return 1;
     }
     config->mutable_video_configs()->push_back(ChannelConfig(
         transport, remoting::protocol::kDefaultStreamVersion, codec));
     simple_host.set_protocol_config(config.release());
   }
 
   return simple_host.Run();
 }