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

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

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/client_native_pixmap_factory.cc ('k') | ui/ozone/public/input_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/public/input_controller.h
diff --git a/ui/ozone/public/input_controller.h b/ui/ozone/public/input_controller.h
index 398fbbe5157eb6a6c8e3182347f78b81069af536..3c5e1bcb84717636dafe6f24eedfaeb8a461053f 100644
--- a/ui/ozone/public/input_controller.h
+++ b/ui/ozone/public/input_controller.h
@@ -5,6 +5,7 @@
#ifndef UI_OZONE_PUBLIC_INPUT_CONTROLLER_H_
#define UI_OZONE_PUBLIC_INPUT_CONTROLLER_H_
+#include <memory>
#include <set>
#include <string>
#include <vector>
@@ -12,7 +13,6 @@
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/ozone/ozone_base_export.h"
namespace base {
@@ -30,9 +30,9 @@ enum class DomCode;
// script that is originally located at /opt/google/chrome/.
class OZONE_BASE_EXPORT InputController {
public:
- typedef base::Callback<void(scoped_ptr<std::string>)>
+ typedef base::Callback<void(std::unique_ptr<std::string>)>
GetTouchDeviceStatusReply;
- typedef base::Callback<void(scoped_ptr<std::vector<base::FilePath>>)>
+ typedef base::Callback<void(std::unique_ptr<std::vector<base::FilePath>>)>
GetTouchEventLogReply;
InputController() {}
@@ -91,7 +91,7 @@ class OZONE_BASE_EXPORT InputController {
};
// Create an input controller that does nothing.
-OZONE_BASE_EXPORT scoped_ptr<InputController> CreateStubInputController();
+OZONE_BASE_EXPORT std::unique_ptr<InputController> CreateStubInputController();
} // namespace ui
« no previous file with comments | « ui/ozone/public/client_native_pixmap_factory.cc ('k') | ui/ozone/public/input_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698