| Index: remoting/host/local_input_monitor_win.cc
|
| diff --git a/remoting/host/local_input_monitor_win.cc b/remoting/host/local_input_monitor_win.cc
|
| index 11073bee086eadbddc8480634e54ab429659d6f9..ac6525e3851c5398b04b38020311c8d49f32ced2 100644
|
| --- a/remoting/host/local_input_monitor_win.cc
|
| +++ b/remoting/host/local_input_monitor_win.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/location.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/threading/non_thread_safe.h"
|
| @@ -69,7 +70,7 @@ class LocalInputMonitorWin : public base::NonThreadSafe,
|
| scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
|
|
|
| // Used to receive raw input.
|
| - scoped_ptr<base::win::MessageWindow> window_;
|
| + std::unique_ptr<base::win::MessageWindow> window_;
|
|
|
| // Points to the object receiving mouse event notifications.
|
| base::WeakPtr<ClientSessionControl> client_session_control_;
|
| @@ -174,7 +175,7 @@ LRESULT LocalInputMonitorWin::Core::OnInput(HRAWINPUT input_handle) {
|
| }
|
|
|
| // Retrieve the input record itself.
|
| - scoped_ptr<uint8_t[]> buffer(new uint8_t[size]);
|
| + std::unique_ptr<uint8_t[]> buffer(new uint8_t[size]);
|
| RAWINPUT* input = reinterpret_cast<RAWINPUT*>(buffer.get());
|
| result = GetRawInputData(input_handle,
|
| RID_INPUT,
|
| @@ -235,12 +236,12 @@ bool LocalInputMonitorWin::Core::HandleMessage(
|
|
|
| } // namespace
|
|
|
| -scoped_ptr<LocalInputMonitor> LocalInputMonitor::Create(
|
| +std::unique_ptr<LocalInputMonitor> LocalInputMonitor::Create(
|
| scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
|
| base::WeakPtr<ClientSessionControl> client_session_control) {
|
| - return make_scoped_ptr(new LocalInputMonitorWin(
|
| + return base::WrapUnique(new LocalInputMonitorWin(
|
| caller_task_runner, ui_task_runner, client_session_control));
|
| }
|
|
|
|
|