| Index: chrome/browser/chromeos/events/event_rewriter_controller.h
|
| diff --git a/chrome/browser/chromeos/events/event_rewriter_controller.h b/chrome/browser/chromeos/events/event_rewriter_controller.h
|
| index bca96ba5e009d7bfc679e2e8b0aa277d957d8622..1d38430d8e0d1fcce0a2466790a44a72a15cb27d 100644
|
| --- a/chrome/browser/chromeos/events/event_rewriter_controller.h
|
| +++ b/chrome/browser/chromeos/events/event_rewriter_controller.h
|
| @@ -6,10 +6,10 @@
|
| #define CHROME_BROWSER_CHROMEOS_EVENTS_EVENT_REWRITER_CONTROLLER_H_
|
|
|
| #include <list>
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "ui/aura/env_observer.h"
|
| #include "ui/events/event_rewriter.h"
|
| @@ -29,7 +29,7 @@ class EventRewriterController : public aura::EnvObserver {
|
| ~EventRewriterController() override;
|
|
|
| // Takes ownership of an EventRewriter; can only be called before Init().
|
| - void AddEventRewriter(scoped_ptr<ui::EventRewriter> rewriter);
|
| + void AddEventRewriter(std::unique_ptr<ui::EventRewriter> rewriter);
|
|
|
| // Add rewriters to any existing root windows; must be called once only
|
| // after ash::Shell has been initialized.
|
|
|