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

Unified Diff: ui/views/mouse_watcher.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/views/linux_ui/linux_ui.h ('k') | ui/views/mouse_watcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mouse_watcher.h
diff --git a/ui/views/mouse_watcher.h b/ui/views/mouse_watcher.h
index 89e13584a74f4a9742c27215fca3faed73053cb6..4737d81d1b62157d29695fd3d4cb87c86348f7ba 100644
--- a/ui/views/mouse_watcher.h
+++ b/ui/views/mouse_watcher.h
@@ -5,8 +5,9 @@
#ifndef UI_VIEWS_MOUSE_WATCHER_H_
#define UI_VIEWS_MOUSE_WATCHER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/views/views_export.h"
@@ -78,13 +79,13 @@ class VIEWS_EXPORT MouseWatcher {
void NotifyListener();
// Host we're listening for events over.
- scoped_ptr<MouseWatcherHost> host_;
+ std::unique_ptr<MouseWatcherHost> host_;
// Our listener.
MouseWatcherListener* listener_;
// Does the actual work of listening for mouse events.
- scoped_ptr<Observer> observer_;
+ std::unique_ptr<Observer> observer_;
// See description above setter.
base::TimeDelta notify_on_exit_time_;
« no previous file with comments | « ui/views/linux_ui/linux_ui.h ('k') | ui/views/mouse_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698