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

Unified Diff: ui/ozone/public/input_controller.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/ozone/public/input_controller.h ('k') | ui/ozone/public/overlay_manager_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/public/input_controller.cc
diff --git a/ui/ozone/public/input_controller.cc b/ui/ozone/public/input_controller.cc
index 45f11e14b16f7d4ea1f7291e0882f0a38ed940ef..665472d4c7bff83ffab61cacb0fbc2e00f6304e3 100644
--- a/ui/ozone/public/input_controller.cc
+++ b/ui/ozone/public/input_controller.cc
@@ -7,6 +7,7 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
namespace ui {
@@ -126,12 +127,12 @@ void StubInputController::SetTapToClickPaused(bool state) {
void StubInputController::GetTouchDeviceStatus(
const GetTouchDeviceStatusReply& reply) {
- reply.Run(scoped_ptr<std::string>(new std::string));
+ reply.Run(std::unique_ptr<std::string>(new std::string));
}
void StubInputController::GetTouchEventLog(const base::FilePath& out_dir,
const GetTouchEventLogReply& reply) {
- reply.Run(make_scoped_ptr(new std::vector<base::FilePath>));
+ reply.Run(base::WrapUnique(new std::vector<base::FilePath>));
}
void StubInputController::SetInternalTouchpadEnabled(bool enabled) {
@@ -150,8 +151,8 @@ void StubInputController::SetInternalKeyboardFilter(
} // namespace
-scoped_ptr<InputController> CreateStubInputController() {
- return make_scoped_ptr(new StubInputController);
+std::unique_ptr<InputController> CreateStubInputController() {
+ return base::WrapUnique(new StubInputController);
}
} // namespace ui
« no previous file with comments | « ui/ozone/public/input_controller.h ('k') | ui/ozone/public/overlay_manager_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698