Revert 155219 - [Chromoting] Refactoring DesktopEnvironment and moving screen/audio recorders to Cl…

remoting/host/event_executor_win.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/event_executor.h"
 
 #include <windows.h>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 26 matching lines @@
   virtual ~EventExecutorWin() {}
 
   // ClipboardStub interface.
   virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
 
   // InputStub interface.
   virtual void InjectKeyEvent(const KeyEvent& event) OVERRIDE;
   virtual void InjectMouseEvent(const MouseEvent& event) OVERRIDE;
 
   // EventExecutor interface.
-  virtual void Start(
+  virtual void OnSessionStarted(
       scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
-  virtual void StopAndDelete() OVERRIDE;
+  virtual void OnSessionFinished() OVERRIDE;
 
  private:
   HKL GetForegroundKeyboardLayout();
   void HandleKey(const KeyEvent& event);
   void HandleMouse(const MouseEvent& event);
 
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
   scoped_ptr<Clipboard> clipboard_;
 
@@ skipping 38 matching lines @@
     main_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&EventExecutorWin::InjectMouseEvent, base::Unretained(this),
                    event));
     return;
   }
 
   HandleMouse(event);
 }
 
-void EventExecutorWin::Start(
+void EventExecutorWin::OnSessionStarted(
     scoped_ptr<protocol::ClipboardStub> client_clipboard) {
   if (!ui_task_runner_->BelongsToCurrentThread()) {
     ui_task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(&EventExecutorWin::Start,
+        base::Bind(&EventExecutorWin::OnSessionStarted,
                    base::Unretained(this),
                    base::Passed(&client_clipboard)));
     return;
   }
 
   clipboard_->Start(client_clipboard.Pass());
 }
 
-void EventExecutorWin::StopAndDelete() {
+void EventExecutorWin::OnSessionFinished() {
   if (!ui_task_runner_->BelongsToCurrentThread()) {
     ui_task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(&EventExecutorWin::StopAndDelete,
+        base::Bind(&EventExecutorWin::OnSessionFinished,
                    base::Unretained(this)));
     return;
   }
 
   clipboard_->Stop();
-  delete this;
 }
 
 HKL EventExecutorWin::GetForegroundKeyboardLayout() {
   HKL layout = 0;
 
   // Can return NULL if a window is losing focus.
   HWND foreground = GetForegroundWindow();
   if (foreground) {
     // Can return 0 if the window no longer exists.
     DWORD thread_id = GetWindowThreadProcessId(foreground, 0);
@@ skipping 148 matching lines @@
 }  // namespace
 
 scoped_ptr<EventExecutor> EventExecutor::Create(
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   return scoped_ptr<EventExecutor>(
       new EventExecutorWin(main_task_runner, ui_task_runner));
 }
 
 }  // namespace remoting