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

Unified Diff: ui/aura/scoped_window_targeter.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/aura/input_state_lookup_win.cc ('k') | ui/aura/scoped_window_targeter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « ui/aura/input_state_lookup_win.cc ('k') | ui/aura/scoped_window_targeter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698