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

Unified Diff: ui/base/accelerators/platform_accelerator_cocoa.mm

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/base/accelerators/platform_accelerator_cocoa.h ('k') | ui/base/clipboard/clipboard.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/accelerators/platform_accelerator_cocoa.mm
diff --git a/ui/base/accelerators/platform_accelerator_cocoa.mm b/ui/base/accelerators/platform_accelerator_cocoa.mm
index ce2b4375ff821fccef634e251e021cc39ec7aaf1..9bfd1e0f3cebf29cd5d95dfd4aa74429555ca826 100644
--- a/ui/base/accelerators/platform_accelerator_cocoa.mm
+++ b/ui/base/accelerators/platform_accelerator_cocoa.mm
@@ -4,7 +4,9 @@
#import "ui/base/accelerators/platform_accelerator_cocoa.h"
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
+#include "base/memory/ptr_util.h"
namespace ui {
@@ -20,11 +22,12 @@ PlatformAcceleratorCocoa::PlatformAcceleratorCocoa(NSString* key_code,
PlatformAcceleratorCocoa::~PlatformAcceleratorCocoa() {
}
-scoped_ptr<PlatformAccelerator> PlatformAcceleratorCocoa::CreateCopy() const {
- scoped_ptr<PlatformAcceleratorCocoa> copy(new PlatformAcceleratorCocoa);
+std::unique_ptr<PlatformAccelerator> PlatformAcceleratorCocoa::CreateCopy()
+ const {
+ std::unique_ptr<PlatformAcceleratorCocoa> copy(new PlatformAcceleratorCocoa);
copy->characters_.reset([characters_ copy]);
copy->modifier_mask_ = modifier_mask_;
- return make_scoped_ptr(copy.release());
+ return base::WrapUnique(copy.release());
}
bool PlatformAcceleratorCocoa::Equals(const PlatformAccelerator& rhs) const {
« no previous file with comments | « ui/base/accelerators/platform_accelerator_cocoa.h ('k') | ui/base/clipboard/clipboard.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698