Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / host / single_window_desktop_environment.cc

diff --git a/src/remoting/host/single_window_desktop_environment.cc b/src/remoting/host/single_window_desktop_environment.cc
index 7950b8a..3b721fc 100644 (file)
--- a/src/remoting/host/single_window_desktop_environment.cc
+++ b/src/remoting/host/single_window_desktop_environment.cc
@@ -16,11 +16,11 @@ namespace remoting {
 class SingleWindowDesktopEnvironment : public BasicDesktopEnvironment {
 
  public:
-  virtual ~SingleWindowDesktopEnvironment();
+  ~SingleWindowDesktopEnvironment() override;
 
   // DesktopEnvironment interface.
-  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() OVERRIDE;
-  virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
+  scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
+  scoped_ptr<InputInjector> CreateInputInjector() override;
 
  protected:
   friend class SingleWindowDesktopEnvironmentFactory;
@@ -51,7 +51,7 @@ SingleWindowDesktopEnvironment::CreateVideoCapturer() {
         webrtc::WindowCapturer::Create(options));
   window_capturer->SelectWindow(window_id_);
 
-  return window_capturer.PassAs<webrtc::DesktopCapturer>();
+  return window_capturer.Pass();
 }
 
 scoped_ptr<InputInjector>
@@ -62,7 +62,7 @@ SingleWindowDesktopEnvironment::CreateInputInjector() {
       InputInjector::Create(input_task_runner(),
                             ui_task_runner()));
   return SingleWindowInputInjector::CreateForWindow(
-      window_id_, input_injector.Pass()).PassAs<InputInjector>();
+             window_id_, input_injector.Pass()).Pass();
 }
 
 SingleWindowDesktopEnvironment::SingleWindowDesktopEnvironment(
@@ -100,7 +100,7 @@ scoped_ptr<DesktopEnvironment> SingleWindowDesktopEnvironmentFactory::Create(
                                          input_task_runner(),
                                          ui_task_runner(),
                                          window_id_));
-  return desktop_environment.PassAs<DesktopEnvironment>();
+  return desktop_environment.Pass();
 }
 
 }  // namespace remoting