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

remoting/host/event_executor_linux.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 <set>
 
 #include <X11/Xlib.h>
 #include <X11/XF86keysym.h>
@@ skipping 32 matching lines @@
 
   // Clipboard stub 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:
   // |mode| is one of the AutoRepeatModeOn, AutoRepeatModeOff,
   // AutoRepeatModeDefault constants defined by the XChangeKeyboardControl()
   // API.
   void SetAutoRepeatForKey(int keycode, int mode);
   void InjectScrollWheelClicks(int button, int count);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
@@ skipping 366 matching lines @@
   }
   if (event.has_wheel_offset_x() && event.wheel_offset_x() != 0) {
     int dx = event.wheel_offset_x();
     InjectScrollWheelClicks(HorizontalScrollWheelToX11ButtonNumber(dx),
                             abs(dx));
   }
 
   XFlush(display_);
 }
 
-void EventExecutorLinux::Start(
+void EventExecutorLinux::OnSessionStarted(
     scoped_ptr<protocol::ClipboardStub> client_clipboard) {
   return;
 }
 
-void EventExecutorLinux::StopAndDelete() {
-  delete this;
+void EventExecutorLinux::OnSessionFinished() {
+  return;
 }
 
 }  // namespace
 
 scoped_ptr<EventExecutor> EventExecutor::Create(
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   scoped_ptr<EventExecutorLinux> executor(
       new EventExecutorLinux(main_task_runner));
   if (!executor->Init())
     return scoped_ptr<EventExecutor>(NULL);
   return executor.PassAs<EventExecutor>();
 }
 
 }  // namespace remoting