[Chromoting] Refactoring DesktopEnvironment and moving screen/audio recorders to ClientSession.

remoting/host/win/session_event_executor.cc

 // Copyright (c) 2012 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.
 
-#include "remoting/host/session_event_executor_win.h"
+#include "remoting/host/win/session_event_executor.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/win/windows_version.h"
 #include "remoting/host/sas_injector.h"
 #include "remoting/host/win/desktop.h"
@@ skipping 33 matching lines @@
       weak_ptr_(weak_ptr_factory_.GetWeakPtr()) {
   // Let |weak_ptr_| be used on the |task_runner_| thread.
   // |weak_ptr_| and |weak_ptr_factory_| share a ThreadChecker, so the
   // following line affects both of them.
   weak_ptr_factory_.DetachFromThread();
 }
 
 SessionEventExecutorWin::~SessionEventExecutorWin() {
 }
 
-void SessionEventExecutorWin::OnSessionStarted(
+void SessionEventExecutorWin::Start(
     scoped_ptr<protocol::ClipboardStub> client_clipboard) {
   if (!task_runner_->BelongsToCurrentThread()) {
     task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(&SessionEventExecutorWin::OnSessionStarted,
+        base::Bind(&SessionEventExecutorWin::Start,
                    weak_ptr_, base::Passed(&client_clipboard)));
     return;
   }
 
-  nested_executor_->OnSessionStarted(client_clipboard.Pass());
+  nested_executor_->Start(client_clipboard.Pass());
 }
 
-void SessionEventExecutorWin::OnSessionFinished() {
+void SessionEventExecutorWin::StopAndDelete() {
   if (!task_runner_->BelongsToCurrentThread()) {
     task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(&SessionEventExecutorWin::OnSessionFinished,
+        base::Bind(&SessionEventExecutorWin::StopAndDelete,
                    weak_ptr_));
     return;
   }
 
-  nested_executor_->OnSessionFinished();
+  nested_executor_.release()->StopAndDelete();
+  delete this;
 }
 
 void SessionEventExecutorWin::InjectClipboardEvent(
     const ClipboardEvent& event) {
   if (!task_runner_->BelongsToCurrentThread()) {
     task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&SessionEventExecutorWin::InjectClipboardEvent,
                    weak_ptr_, event));
     return;
@@ skipping 54 matching lines @@
   // one.
   scoped_ptr<Desktop> input_desktop = Desktop::GetInputDesktop();
   if (input_desktop.get() != NULL && !desktop_.IsSame(*input_desktop)) {
     // If SetThreadDesktop() fails, the thread is still assigned a desktop.
     // So we can continue capture screen bits, just from a diffected desktop.
     desktop_.SetThreadDesktop(input_desktop.Pass());
   }
 }
 
 }  // namespace remoting