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

Unified Diff: ui/events/test/test_event_processor.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/events_test_utils_x11.h ('k') | ui/events/test/test_event_processor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/test/test_event_processor.h
diff --git a/ui/events/test/test_event_processor.h b/ui/events/test/test_event_processor.h
index 6129756cc5ffd0fa0913cec76acef36b42613d1e..9b71282138d76e4b1577ad9f3dff938b0c94b086 100644
--- a/ui/events/test/test_event_processor.h
+++ b/ui/events/test/test_event_processor.h
@@ -5,8 +5,9 @@
#ifndef UI_EVENTS_TEST_TEST_EVENT_PROCESSOR_H_
#define UI_EVENTS_TEST_TEST_EVENT_PROCESSOR_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/events/event_processor.h"
namespace ui {
@@ -29,7 +30,7 @@ class TestEventProcessor : public EventProcessor {
should_processing_occur_ = occur;
}
- void SetRoot(scoped_ptr<EventTarget> root);
+ void SetRoot(std::unique_ptr<EventTarget> root);
void Reset();
// EventProcessor:
@@ -40,7 +41,7 @@ class TestEventProcessor : public EventProcessor {
void OnEventProcessingFinished(Event* event) override;
private:
- scoped_ptr<EventTarget> root_;
+ std::unique_ptr<EventTarget> root_;
// Used in our override of OnEventProcessingStarted(). If this value is
// false, mark incoming events as handled.
« no previous file with comments | « ui/events/test/events_test_utils_x11.h ('k') | ui/events/test/test_event_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698