| Index: remoting/host/input_injector_mac.cc
|
| diff --git a/remoting/host/input_injector_mac.cc b/remoting/host/input_injector_mac.cc
|
| index fc2ba1b19ce3fb875783812eab8c96170f65c580..2b00c195347e3cb099043a15649dacc8af742c9c 100644
|
| --- a/remoting/host/input_injector_mac.cc
|
| +++ b/remoting/host/input_injector_mac.cc
|
| @@ -17,6 +17,7 @@
|
| #include "base/location.h"
|
| #include "base/mac/scoped_cftyperef.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -82,7 +83,8 @@ class InputInjectorMac : public InputInjector {
|
| void InjectTouchEvent(const TouchEvent& event) override;
|
|
|
| // InputInjector interface.
|
| - void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
|
| + void Start(
|
| + std::unique_ptr<protocol::ClipboardStub> client_clipboard) override;
|
|
|
| private:
|
| // The actual implementation resides in InputInjectorMac::Core class.
|
| @@ -99,7 +101,7 @@ class InputInjectorMac : public InputInjector {
|
| void InjectMouseEvent(const MouseEvent& event);
|
|
|
| // Mirrors the InputInjector interface.
|
| - void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard);
|
| + void Start(std::unique_ptr<protocol::ClipboardStub> client_clipboard);
|
|
|
| void Stop();
|
|
|
| @@ -112,7 +114,7 @@ class InputInjectorMac : public InputInjector {
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| webrtc::DesktopVector mouse_pos_;
|
| uint32_t mouse_button_state_;
|
| - scoped_ptr<Clipboard> clipboard_;
|
| + std::unique_ptr<Clipboard> clipboard_;
|
| uint64_t left_modifiers_;
|
| uint64_t right_modifiers_;
|
| base::TimeTicks last_time_display_woken_;
|
| @@ -155,7 +157,7 @@ void InputInjectorMac::InjectTouchEvent(const TouchEvent& event) {
|
| }
|
|
|
| void InputInjectorMac::Start(
|
| - scoped_ptr<protocol::ClipboardStub> client_clipboard) {
|
| + std::unique_ptr<protocol::ClipboardStub> client_clipboard) {
|
| core_->Start(std::move(client_clipboard));
|
| }
|
|
|
| @@ -335,7 +337,7 @@ void InputInjectorMac::Core::InjectMouseEvent(const MouseEvent& event) {
|
| }
|
|
|
| void InputInjectorMac::Core::Start(
|
| - scoped_ptr<protocol::ClipboardStub> client_clipboard) {
|
| + std::unique_ptr<protocol::ClipboardStub> client_clipboard) {
|
| if (!task_runner_->BelongsToCurrentThread()) {
|
| task_runner_->PostTask(
|
| FROM_HERE,
|
| @@ -388,10 +390,10 @@ InputInjectorMac::Core::~Core() {}
|
| } // namespace
|
|
|
| // static
|
| -scoped_ptr<InputInjector> InputInjector::Create(
|
| +std::unique_ptr<InputInjector> InputInjector::Create(
|
| scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
|
| - return make_scoped_ptr(new InputInjectorMac(main_task_runner));
|
| + return base::WrapUnique(new InputInjectorMac(main_task_runner));
|
| }
|
|
|
| // static
|
|
|