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

Unified Diff: device/hid/hid_service_linux.h

Issue 1874313002: Convert device to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 | « device/hid/hid_service.cc ('k') | device/hid/hid_service_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/hid/hid_service_linux.h
diff --git a/device/hid/hid_service_linux.h b/device/hid/hid_service_linux.h
index 7d928300ec17093454b310685cd43898677512b5..314a2496c37daf6f056bb728b22d477744d01f33 100644
--- a/device/hid/hid_service_linux.h
+++ b/device/hid/hid_service_linux.h
@@ -5,6 +5,8 @@
#ifndef DEVICE_HID_HID_SERVICE_LINUX_H_
#define DEVICE_HID_HID_SERVICE_LINUX_H_
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -37,19 +39,19 @@ class HidServiceLinux : public HidService {
// functions are static and the necessary parameters are passed as a single
// struct.
#if defined(OS_CHROMEOS)
- static void OnPathOpenComplete(scoped_ptr<ConnectParams> params,
+ static void OnPathOpenComplete(std::unique_ptr<ConnectParams> params,
dbus::FileDescriptor fd);
static void OnPathOpenError(const std::string& device_path,
const ConnectCallback& callback,
const std::string& error_name,
const std::string& error_message);
- static void ValidateFdOnBlockingThread(scoped_ptr<ConnectParams> params,
+ static void ValidateFdOnBlockingThread(std::unique_ptr<ConnectParams> params,
dbus::FileDescriptor fd);
#else
- static void OpenOnBlockingThread(scoped_ptr<ConnectParams> params);
+ static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params);
#endif
- static void FinishOpen(scoped_ptr<ConnectParams> params);
- static void CreateConnection(scoped_ptr<ConnectParams> params);
+ static void FinishOpen(std::unique_ptr<ConnectParams> params);
+ static void CreateConnection(std::unique_ptr<ConnectParams> params);
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
« no previous file with comments | « device/hid/hid_service.cc ('k') | device/hid/hid_service_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698