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

Unified Diff: remoting/host/clipboard_mac.mm

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.h ('k') | remoting/host/clipboard_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/clipboard_mac.mm
diff --git a/remoting/host/clipboard_mac.mm b/remoting/host/clipboard_mac.mm
index 758f39b8949dc4c43c78fc6eba0026484df73358..d361a648513c82511ef12e300484db1e3c5918e8 100644
--- a/remoting/host/clipboard_mac.mm
+++ b/remoting/host/clipboard_mac.mm
@@ -7,9 +7,11 @@
#import <Cocoa/Cocoa.h>
#include <stdint.h>
+#include <memory>
+
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/timer/timer.h"
#include "remoting/base/constants.h"
@@ -31,14 +33,15 @@ class ClipboardMac : public Clipboard {
ClipboardMac();
~ClipboardMac() override;
- void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
+ void Start(
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) override;
void InjectClipboardEvent(const protocol::ClipboardEvent& event) override;
private:
void CheckClipboardForChanges();
- scoped_ptr<protocol::ClipboardStub> client_clipboard_;
- scoped_ptr<base::RepeatingTimer> clipboard_polling_timer_;
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard_;
+ std::unique_ptr<base::RepeatingTimer> clipboard_polling_timer_;
NSInteger current_change_count_;
DISALLOW_COPY_AND_ASSIGN(ClipboardMac);
@@ -48,7 +51,8 @@ ClipboardMac::ClipboardMac() : current_change_count_(0) {}
ClipboardMac::~ClipboardMac() {}
-void ClipboardMac::Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) {
+void ClipboardMac::Start(
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) {
client_clipboard_.reset(client_clipboard.release());
// Synchronize local change-count with the pasteboard's. The change-count is
@@ -103,8 +107,8 @@ void ClipboardMac::CheckClipboardForChanges() {
client_clipboard_->InjectClipboardEvent(event);
}
-scoped_ptr<Clipboard> Clipboard::Create() {
- return make_scoped_ptr(new ClipboardMac());
+std::unique_ptr<Clipboard> Clipboard::Create() {
+ return base::WrapUnique(new ClipboardMac());
}
} // namespace remoting
« no previous file with comments | « remoting/host/clipboard.h ('k') | remoting/host/clipboard_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698