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

Unified Diff: ui/base/cocoa/constrained_window/constrained_window_animation_unittest.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/clipboard/clipboard_win.h ('k') | ui/base/cocoa/three_part_image_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/constrained_window/constrained_window_animation_unittest.mm
diff --git a/ui/base/cocoa/constrained_window/constrained_window_animation_unittest.mm b/ui/base/cocoa/constrained_window/constrained_window_animation_unittest.mm
index 995d042ec93f3e814c9735dfcf97b7f34011c926..d7637190c8be6fd1a0f0e8e4dac1da81da8ea186 100644
--- a/ui/base/cocoa/constrained_window/constrained_window_animation_unittest.mm
+++ b/ui/base/cocoa/constrained_window/constrained_window_animation_unittest.mm
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#import "ui/base/cocoa/constrained_window/constrained_window_animation.h"
+
+#include <memory>
+
#include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_pump_mac.h"
-#import "ui/base/cocoa/constrained_window/constrained_window_animation.h"
#import "ui/gfx/test/ui_cocoa_test_helper.h"
// This class runs an animation for exactly two frames then end it.
@@ -13,7 +15,7 @@
: NSObject<NSAnimationDelegate> {
@private
CGFloat frameCount_;
- scoped_ptr<base::MessagePumpNSRunLoop> message_pump_;
+ std::unique_ptr<base::MessagePumpNSRunLoop> message_pump_;
}
- (void)runAnimation:(NSAnimation*)animation;
« no previous file with comments | « ui/base/clipboard/clipboard_win.h ('k') | ui/base/cocoa/three_part_image_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698