| Index: ui/events/platform/platform_event_source.h
|
| diff --git a/ui/events/platform/platform_event_source.h b/ui/events/platform/platform_event_source.h
|
| index e6b569e5d1330112808ddda8b8ab87c270f28fc3..4cfe5b2441ff17aa49890db2976041b4990f0837 100644
|
| --- a/ui/events/platform/platform_event_source.h
|
| +++ b/ui/events/platform/platform_event_source.h
|
| @@ -8,11 +8,11 @@
|
| #include <stdint.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/auto_reset.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "ui/events/events_export.h"
|
| #include "ui/events/platform/platform_event_types.h"
|
| @@ -54,7 +54,7 @@ class EVENTS_EXPORT PlatformEventSource {
|
| // dispatcher. When this handler is destroyed, it removes the overridden
|
| // dispatcher, and restores the previous override-dispatcher (or NULL if there
|
| // wasn't any).
|
| - scoped_ptr<ScopedEventDispatcher> OverrideDispatcher(
|
| + std::unique_ptr<ScopedEventDispatcher> OverrideDispatcher(
|
| PlatformEventDispatcher* dispatcher);
|
|
|
| // Called to indicate that the source should stop dispatching the current
|
| @@ -65,7 +65,7 @@ class EVENTS_EXPORT PlatformEventSource {
|
| void AddPlatformEventObserver(PlatformEventObserver* observer);
|
| void RemovePlatformEventObserver(PlatformEventObserver* observer);
|
|
|
| - static scoped_ptr<PlatformEventSource> CreateDefault();
|
| + static std::unique_ptr<PlatformEventSource> CreateDefault();
|
|
|
| protected:
|
| PlatformEventSource();
|
|
|