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

Unified Diff: remoting/host/touch_injector_win.h

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/token_validator_factory_impl_unittest.cc ('k') | remoting/host/touch_injector_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/touch_injector_win.h
diff --git a/remoting/host/touch_injector_win.h b/remoting/host/touch_injector_win.h
index 625601870bc82846538229165748f8ffbe02cfc8..c07237372cad1cc949ff969141ccbb0aa314d3cf 100644
--- a/remoting/host/touch_injector_win.h
+++ b/remoting/host/touch_injector_win.h
@@ -8,10 +8,10 @@
#include <windows.h>
#include <stdint.h>
#include <map>
+#include <memory>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/scoped_native_library.h"
namespace remoting {
@@ -30,7 +30,7 @@ class TouchInjectorWinDelegate {
// Determines whether Windows touch injection functions can be used.
// Returns a non-null TouchInjectorWinDelegate on success.
- static scoped_ptr<TouchInjectorWinDelegate> Create();
+ static std::unique_ptr<TouchInjectorWinDelegate> Create();
// These match the functions in MSDN.
virtual BOOL InitializeTouchInjection(UINT32 max_count, DWORD dw_mode);
@@ -75,7 +75,7 @@ class TouchInjectorWin {
void InjectTouchEvent(const protocol::TouchEvent& event);
void SetInjectorDelegateForTest(
- scoped_ptr<TouchInjectorWinDelegate> functions);
+ std::unique_ptr<TouchInjectorWinDelegate> functions);
private:
// Helper methods called from InjectTouchEvent().
@@ -88,7 +88,7 @@ class TouchInjectorWin {
void CancelTouchPoints(const protocol::TouchEvent& event);
// Set to null if touch injection is not available from the OS.
- scoped_ptr<TouchInjectorWinDelegate> delegate_;
+ std::unique_ptr<TouchInjectorWinDelegate> delegate_;
// TODO(rkuroiwa): crbug.com/470203
// This is a naive implementation. Check if we can achieve
« no previous file with comments | « remoting/host/token_validator_factory_impl_unittest.cc ('k') | remoting/host/touch_injector_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698