Update To 11.40.268.0

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

diff --git a/src/remoting/host/curtain_mode_mac.cc b/src/remoting/host/curtain_mode_mac.cc
index aa85156..b0718e8 100644 (file)
--- a/src/remoting/host/curtain_mode_mac.cc
+++ b/src/remoting/host/curtain_mode_mac.cc
@@ -226,10 +226,10 @@ class CurtainModeMac : public CurtainMode {
       scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
       base::WeakPtr<ClientSessionControl> client_session_control);
-  virtual ~CurtainModeMac();
+  ~CurtainModeMac() override;
 
   // Overriden from CurtainMode.
-  virtual bool Activate() OVERRIDE;
+  bool Activate() override;
 
  private:
   scoped_refptr<SessionWatcher> session_watcher_;
@@ -260,9 +260,8 @@ scoped_ptr<CurtainMode> CurtainMode::Create(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
     base::WeakPtr<ClientSessionControl> client_session_control) {
-  return scoped_ptr<CurtainMode>(new CurtainModeMac(caller_task_runner,
-                                                    ui_task_runner,
-                                                    client_session_control));
+  return make_scoped_ptr(new CurtainModeMac(
+      caller_task_runner, ui_task_runner, client_session_control));
 }
 
 }  // namespace remoting