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

Unified Diff: ui/events/test/event_generator.h

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/events/test/device_data_manager_test_api.h ('k') | ui/events/test/event_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/test/event_generator.h
diff --git a/ui/events/test/event_generator.h b/ui/events/test/event_generator.h
index 410160dc5cfe5cc06e88fc5040b5c7d0d182774f..ad664a568eadfae36cee6f34b9c7b4e9e156a6a3 100644
--- a/ui/events/test/event_generator.h
+++ b/ui/events/test/event_generator.h
@@ -6,11 +6,11 @@
#define UI_EVENTS_TEST_EVENT_GENERATOR_H_
#include <list>
+#include <memory>
#include <vector>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "ui/events/event_constants.h"
#include "ui/events/keycodes/keyboard_codes.h"
@@ -369,7 +369,7 @@ class EventGenerator {
}
// Specify an alternative tick clock to be used for simulating time in tests.
- void SetTickClock(scoped_ptr<base::TickClock> tick_clock);
+ void SetTickClock(std::unique_ptr<base::TickClock> tick_clock);
// Get the current time from the tick clock.
base::TimeDelta Now();
@@ -397,16 +397,16 @@ class EventGenerator {
const EventGeneratorDelegate* delegate() const;
EventGeneratorDelegate* delegate();
- scoped_ptr<EventGeneratorDelegate> delegate_;
+ std::unique_ptr<EventGeneratorDelegate> delegate_;
gfx::Point current_location_;
EventTarget* current_target_;
int flags_;
bool grab_;
- std::list<scoped_ptr<Event>> pending_events_;
+ std::list<std::unique_ptr<Event>> pending_events_;
// Set to true to cause events to be posted asynchronously.
bool async_;
bool targeting_application_;
- scoped_ptr<base::TickClock> tick_clock_;
+ std::unique_ptr<base::TickClock> tick_clock_;
DISALLOW_COPY_AND_ASSIGN(EventGenerator);
};
« no previous file with comments | « ui/events/test/device_data_manager_test_api.h ('k') | ui/events/test/event_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698