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

Unified Diff: ui/views/test/event_generator_delegate_mac.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/views/test/default_platform_test_helper.cc ('k') | ui/views/test/menu_runner_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/event_generator_delegate_mac.mm
diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm
index 44e08a5adaea5aabfe0ef6f305d7098f3ea99b28..a005dbca212fa68b147096c127affe3ae6a50e66 100644
--- a/ui/views/test/event_generator_delegate_mac.mm
+++ b/ui/views/test/event_generator_delegate_mac.mm
@@ -241,7 +241,7 @@ class EventGeneratorDelegateMac : public ui::EventTarget,
// Overridden from ui::EventTarget:
bool CanAcceptEvent(const ui::Event& event) override { return true; }
ui::EventTarget* GetParentTarget() override { return nullptr; }
- scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
+ std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override;
ui::EventTargeter* GetEventTargeter() override { return this; }
// Overridden from ui::EventHandler:
@@ -302,9 +302,9 @@ class EventGeneratorDelegateMac : public ui::EventTarget,
ui::test::EventGenerator* owner_;
base::scoped_nsobject<NSWindow> window_;
- scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_pressed_;
- scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_location_;
- scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_current_event_;
+ std::unique_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_pressed_;
+ std::unique_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_location_;
+ std::unique_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_current_event_;
base::scoped_nsobject<NSMenu> fake_menu_;
DISALLOW_COPY_AND_ASSIGN(EventGeneratorDelegateMac);
@@ -342,7 +342,7 @@ EventGeneratorDelegateMac::~EventGeneratorDelegateMac() {
ui::test::EventGenerator::default_delegate = nullptr;
}
-scoped_ptr<ui::EventTargetIterator>
+std::unique_ptr<ui::EventTargetIterator>
EventGeneratorDelegateMac::GetChildIterator() const {
// Return nullptr to dispatch all events to the result of GetRootTarget().
return nullptr;
« no previous file with comments | « ui/views/test/default_platform_test_helper.cc ('k') | ui/views/test/menu_runner_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698