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

Unified Diff: remoting/host/clipboard_win.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/clipboard_mac.mm ('k') | remoting/host/clipboard_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/clipboard_win.cc
diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc
index 007d6e432410ae3cddc4e980e6e4b48983b9fe55..ff8d46da158005cc27d332a5cedf5528637b01ee 100644
--- a/remoting/host/clipboard_win.cc
+++ b/remoting/host/clipboard_win.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/platform_thread.h"
@@ -110,7 +111,7 @@ class ClipboardWin : public Clipboard {
~ClipboardWin() override;
void Start(
- scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) override;
void InjectClipboardEvent(
const protocol::ClipboardEvent& event) override;
@@ -123,12 +124,12 @@ class ClipboardWin : public Clipboard {
LPARAM lparam,
LRESULT* result);
- scoped_ptr<protocol::ClipboardStub> client_clipboard_;
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard_;
AddClipboardFormatListenerFn* add_clipboard_format_listener_;
RemoveClipboardFormatListenerFn* remove_clipboard_format_listener_;
// Used to subscribe to WM_CLIPBOARDUPDATE messages.
- scoped_ptr<base::win::MessageWindow> window_;
+ std::unique_ptr<base::win::MessageWindow> window_;
DISALLOW_COPY_AND_ASSIGN(ClipboardWin);
};
@@ -144,7 +145,7 @@ ClipboardWin::~ClipboardWin() {
}
void ClipboardWin::Start(
- scoped_ptr<protocol::ClipboardStub> client_clipboard) {
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) {
DCHECK(!add_clipboard_format_listener_);
DCHECK(!remove_clipboard_format_listener_);
DCHECK(!window_);
@@ -273,8 +274,8 @@ bool ClipboardWin::HandleMessage(
return false;
}
-scoped_ptr<Clipboard> Clipboard::Create() {
- return make_scoped_ptr(new ClipboardWin());
+std::unique_ptr<Clipboard> Clipboard::Create() {
+ return base::WrapUnique(new ClipboardWin());
}
} // namespace remoting
« no previous file with comments | « remoting/host/clipboard_mac.mm ('k') | remoting/host/clipboard_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698