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

Unified Diff: remoting/host/input_injector_chromeos.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_chromeos.h ('k') | remoting/host/input_injector_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/input_injector_chromeos.cc
diff --git a/remoting/host/input_injector_chromeos.cc b/remoting/host/input_injector_chromeos.cc
index 49b08e75c92c93498d73cf688056e268ffce239a..65c58de51e89407aecacc3fd941a3d05a6e87ae8 100644
--- a/remoting/host/input_injector_chromeos.cc
+++ b/remoting/host/input_injector_chromeos.cc
@@ -11,6 +11,7 @@
#include "base/bind_helpers.h"
#include "base/location.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "remoting/host/chromeos/point_transformer.h"
#include "remoting/host/clipboard.h"
#include "remoting/proto/internal.pb.h"
@@ -56,15 +57,15 @@ class InputInjectorChromeos::Core {
void InjectKeyEvent(const KeyEvent& event);
void InjectTextEvent(const TextEvent& event);
void InjectMouseEvent(const MouseEvent& event);
- void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard);
+ void Start(std::unique_ptr<protocol::ClipboardStub> client_clipboard);
private:
- scoped_ptr<ui::SystemInputInjector> delegate_;
- scoped_ptr<Clipboard> clipboard_;
+ std::unique_ptr<ui::SystemInputInjector> delegate_;
+ std::unique_ptr<Clipboard> clipboard_;
// Used to rotate the input coordinates appropriately based on the current
// display rotation settings.
- scoped_ptr<PointTransformer> point_transformer_;
+ std::unique_ptr<PointTransformer> point_transformer_;
DISALLOW_COPY_AND_ASSIGN(Core);
};
@@ -111,7 +112,7 @@ void InputInjectorChromeos::Core::InjectMouseEvent(const MouseEvent& event) {
}
void InputInjectorChromeos::Core::Start(
- scoped_ptr<protocol::ClipboardStub> client_clipboard) {
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) {
ui::OzonePlatform* ozone_platform = ui::OzonePlatform::GetInstance();
delegate_ = ozone_platform->CreateSystemInputInjector();
DCHECK(delegate_);
@@ -161,19 +162,19 @@ void InputInjectorChromeos::InjectTouchEvent(const TouchEvent& event) {
}
void InputInjectorChromeos::Start(
- scoped_ptr<protocol::ClipboardStub> client_clipboard) {
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) {
input_task_runner_->PostTask(
FROM_HERE, base::Bind(&Core::Start, base::Unretained(core_.get()),
base::Passed(&client_clipboard)));
}
// static
-scoped_ptr<InputInjector> InputInjector::Create(
+std::unique_ptr<InputInjector> InputInjector::Create(
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
// The Ozone input injector must be called on the UI task runner of the
// browser process.
- return make_scoped_ptr(new InputInjectorChromeos(ui_task_runner));
+ return base::WrapUnique(new InputInjectorChromeos(ui_task_runner));
}
// static
« no previous file with comments | « remoting/host/input_injector_chromeos.h ('k') | remoting/host/input_injector_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698