Pass a DesktopEnvironmentFactory when creating DesktopProcess.

remoting/host/desktop_session_agent.h

 // 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.
 
 #ifndef REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
 #define REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
 
 #include <list>
 
 #include "base/basictypes.h"
@@ skipping 15 matching lines @@
 namespace IPC {
 class ChannelProxy;
 class Message;
 }  // namespace IPC
 
 namespace remoting {
 
 class AudioCapturer;
 class AudioPacket;
 class AutoThreadTaskRunner;
+class DesktopEnvironmentFactory;
 class DisconnectWindow;
 class EventExecutor;
 class LocalInputMonitor;
 class RemoteInputFilter;
 
 namespace protocol {
 class InputEventTracker;
 }  // namespace protocol
 
 // Provides screen/audio capturing and input injection services for
 // the network process.
 class DesktopSessionAgent
     : public base::RefCountedThreadSafe<DesktopSessionAgent>,
       public IPC::Listener,
       public MouseMoveObserver,
       public media::ScreenCapturer::Delegate {
  public:
   class Delegate {
    public:
     virtual ~Delegate();
 
+    // Returns an instance of desktop environment factory used.
+    virtual DesktopEnvironmentFactory& desktop_environment_factory() = 0;
+
     // Notifies the delegate that the network-to-desktop channel has been
     // disconnected.
     virtual void OnNetworkProcessDisconnected() = 0;
-
-    // Request the delegate to inject Secure Attention Sequence.
-    virtual void InjectSas() = 0;
   };
 
   static scoped_refptr<DesktopSessionAgent> Create(
       scoped_refptr<AutoThreadTaskRunner> audio_capture_task_runner,
       scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
       scoped_refptr<AutoThreadTaskRunner> input_task_runner,
       scoped_refptr<AutoThreadTaskRunner> io_task_runner,
       scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner);
 
   // IPC::Listener implementation.
@@ skipping 40 matching lines @@
 
   friend class base::RefCountedThreadSafe<DesktopSessionAgent>;
   virtual ~DesktopSessionAgent();
 
   // Creates a connected IPC channel to be used to access the screen/audio
   // recorders and input stubs.
   virtual bool CreateChannelForNetworkProcess(
       IPC::PlatformFileForTransit* client_out,
       scoped_ptr<IPC::ChannelProxy>* server_out) = 0;
 
-  // Creates an event executor specific to the platform.
-  virtual scoped_ptr<EventExecutor> CreateEventExecutor() = 0;
-
   // Handles StartSessionAgent request from the client.
   void OnStartSessionAgent(const std::string& authenticated_jid);
 
   // Handles CaptureFrame requests from the client.
   void OnCaptureFrame();
 
   // Handles InvalidateRegion requests from the client.
   void OnInvalidateRegion(const std::vector<SkIRect>& invalid_rects);
 
   // Handles SharedBufferCreated notification from the client.
@@ skipping 105 matching lines @@
   scoped_ptr<media::ScreenCapturer> video_capturer_;
 
   UiStrings ui_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopSessionAgent);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_DESKTOP_SESSION_AGENT_H_