Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1020)

Unified Diff: remoting/host/input_injector_win.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/input_injector_mac.cc ('k') | remoting/host/input_injector_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/input_injector_win.cc
diff --git a/remoting/host/input_injector_win.cc b/remoting/host/input_injector_win.cc
index d1fefa9b0e4ef43dcc0b2d687346f71d061f9e1f..f8a86a2c1bbcdb6e95662c7a9761503633e2749a 100644
--- a/remoting/host/input_injector_win.cc
+++ b/remoting/host/input_injector_win.cc
@@ -13,6 +13,7 @@
#include "base/compiler_specific.h"
#include "base/location.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/string16.h"
@@ -76,7 +77,7 @@ class InputInjectorWin : public InputInjector {
// InputInjector interface.
void Start(
- scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) override;
private:
// The actual implementation resides in InputInjectorWin::Core class.
@@ -95,7 +96,7 @@ class InputInjectorWin : public InputInjector {
void InjectTouchEvent(const TouchEvent& event);
// Mirrors the InputInjector interface.
- void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard);
+ void Start(std::unique_ptr<protocol::ClipboardStub> client_clipboard);
void Stop();
@@ -110,7 +111,7 @@ class InputInjectorWin : public InputInjector {
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
- scoped_ptr<Clipboard> clipboard_;
+ std::unique_ptr<Clipboard> clipboard_;
TouchInjectorWin touch_injector_;
DISALLOW_COPY_AND_ASSIGN(Core);
@@ -152,7 +153,7 @@ void InputInjectorWin::InjectTouchEvent(const TouchEvent& event) {
}
void InputInjectorWin::Start(
- scoped_ptr<protocol::ClipboardStub> client_clipboard) {
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) {
core_->Start(std::move(client_clipboard));
}
@@ -216,7 +217,7 @@ void InputInjectorWin::Core::InjectTouchEvent(const TouchEvent& event) {
}
void InputInjectorWin::Core::Start(
- scoped_ptr<protocol::ClipboardStub> client_clipboard) {
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) {
if (!ui_task_runner_->BelongsToCurrentThread()) {
ui_task_runner_->PostTask(
FROM_HERE,
@@ -353,10 +354,10 @@ void InputInjectorWin::Core::HandleTouch(const TouchEvent& event) {
} // 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(
+ return base::WrapUnique(
new InputInjectorWin(main_task_runner, ui_task_runner));
}
« no previous file with comments | « remoting/host/input_injector_mac.cc ('k') | remoting/host/input_injector_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698