Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / host / me2me_desktop_environment.h

diff --git a/src/remoting/host/me2me_desktop_environment.h b/src/remoting/host/me2me_desktop_environment.h
index f028664..40ba282 100644 (file)
--- a/src/remoting/host/me2me_desktop_environment.h
+++ b/src/remoting/host/me2me_desktop_environment.h
@@ -17,12 +17,13 @@ class LocalInputMonitor;
 // notifications on Linux.
 class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
  public:
-  virtual ~Me2MeDesktopEnvironment();
+  ~Me2MeDesktopEnvironment() override;
 
   // DesktopEnvironment interface.
-  virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
-  virtual scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
-  virtual std::string GetCapabilities() const OVERRIDE;
+  scoped_ptr<ScreenControls> CreateScreenControls() override;
+  std::string GetCapabilities() const override;
+  scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
+      protocol::ClientStub* client_stub) override;
 
  protected:
   friend class Me2MeDesktopEnvironmentFactory;
@@ -37,6 +38,8 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
       base::WeakPtr<ClientSessionControl> client_session_control,
       bool curtain_enabled);
 
+  void SetEnableGnubbyAuth(bool gnubby_auth_enabled);
+
  private:
   // "Curtains" the session making sure it is disconnected from the local
   // console.
@@ -48,6 +51,9 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
   // Notifies the client session about the local mouse movements.
   scoped_ptr<LocalInputMonitor> local_input_monitor_;
 
+  // True if gnubby auth is enabled.
+  bool gnubby_auth_enabled_;
+
   DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironment);
 };
 
@@ -58,12 +64,13 @@ class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
       scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
-  virtual ~Me2MeDesktopEnvironmentFactory();
+  ~Me2MeDesktopEnvironmentFactory() override;
 
   // DesktopEnvironmentFactory interface.
-  virtual scoped_ptr<DesktopEnvironment> Create(
-      base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
-  virtual void SetEnableCurtaining(bool enable) OVERRIDE;
+  scoped_ptr<DesktopEnvironment> Create(
+      base::WeakPtr<ClientSessionControl> client_session_control) override;
+  void SetEnableCurtaining(bool enable) override;
+  void SetEnableGnubbyAuth(bool enable) override;
 
  protected:
   bool curtain_enabled() const { return curtain_enabled_; }
@@ -72,6 +79,9 @@ class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
   // True if curtain mode is enabled.
   bool curtain_enabled_;
 
+  // True if gnubby auth is enabled.
+  bool gnubby_auth_enabled_;
+
   DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironmentFactory);
 };