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

Unified Diff: ui/events/platform/platform_event_source.cc

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/platform/platform_event_source.h ('k') | ui/events/platform/platform_event_source_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/platform/platform_event_source.cc
diff --git a/ui/events/platform/platform_event_source.cc b/ui/events/platform/platform_event_source.cc
index 99f69ac37390acd646819bbe8f5c8b1427bf2b71..e274971c6ae2a8bfc6ffe9850cf9d3236211d384 100644
--- a/ui/events/platform/platform_event_source.cc
+++ b/ui/events/platform/platform_event_source.cc
@@ -6,6 +6,7 @@
#include <algorithm>
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "ui/events/platform/platform_event_dispatcher.h"
#include "ui/events/platform/platform_event_observer.h"
@@ -43,11 +44,11 @@ void PlatformEventSource::RemovePlatformEventDispatcher(
OnDispatcherListChanged();
}
-scoped_ptr<ScopedEventDispatcher> PlatformEventSource::OverrideDispatcher(
+std::unique_ptr<ScopedEventDispatcher> PlatformEventSource::OverrideDispatcher(
PlatformEventDispatcher* dispatcher) {
CHECK(dispatcher);
overridden_dispatcher_restored_ = false;
- return make_scoped_ptr(
+ return base::WrapUnique(
new ScopedEventDispatcher(&overridden_dispatcher_, dispatcher));
}
« no previous file with comments | « ui/events/platform/platform_event_source.h ('k') | ui/events/platform/platform_event_source_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698