Index: ui/aura/scoped_window_targeter.h |
diff --git a/ui/aura/scoped_window_targeter.h b/ui/aura/scoped_window_targeter.h |
index d268792009ec731f8a1ba460bb81c17d5d2a62f5..d452e9f3b004fa6ca332eae65361eb473fadf297 100644 |
--- a/ui/aura/scoped_window_targeter.h |
+++ b/ui/aura/scoped_window_targeter.h |
@@ -5,8 +5,9 @@ |
#ifndef UI_AURA_SCOPED_WINDOW_TARGETER_H_ |
#define UI_AURA_SCOPED_WINDOW_TARGETER_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/aura/window_observer.h" |
namespace ui { |
@@ -23,7 +24,7 @@ class Window; |
class AURA_EXPORT ScopedWindowTargeter : public WindowObserver { |
public: |
ScopedWindowTargeter(Window* window, |
- scoped_ptr<ui::EventTargeter> new_targeter); |
+ std::unique_ptr<ui::EventTargeter> new_targeter); |
~ScopedWindowTargeter() override; |
@@ -36,7 +37,7 @@ class AURA_EXPORT ScopedWindowTargeter : public WindowObserver { |
void OnWindowDestroyed(Window* window) override; |
Window* window_; |
- scoped_ptr<ui::EventTargeter> old_targeter_; |
+ std::unique_ptr<ui::EventTargeter> old_targeter_; |
DISALLOW_COPY_AND_ASSIGN(ScopedWindowTargeter); |
}; |