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

Unified Diff: ui/views/test/x11_property_change_waiter.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/test/webview_test_helper.h ('k') | ui/views/touchui/touch_selection_controller_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/x11_property_change_waiter.h
diff --git a/ui/views/test/x11_property_change_waiter.h b/ui/views/test/x11_property_change_waiter.h
index 823813b8285ec0eb8a691a1bc782f799b9481f71..cba356c9311b816e3596b4946c71e0b681a5e239 100644
--- a/ui/views/test/x11_property_change_waiter.h
+++ b/ui/views/test/x11_property_change_waiter.h
@@ -7,9 +7,10 @@
#include <stdint.h>
+#include <memory>
+
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/events/platform/platform_event_dispatcher.h"
#include "ui/events/platform/platform_event_types.h"
#include "ui/gfx/x/x11_types.h"
@@ -55,9 +56,9 @@ class X11PropertyChangeWaiter : public ui::PlatformEventDispatcher {
// The event mask to be restored upon X11PropertyChangeWaiter's destruction.
long old_event_mask_;
- scoped_ptr<ui::ScopedEventDispatcher> dispatcher_;
+ std::unique_ptr<ui::ScopedEventDispatcher> dispatcher_;
- scoped_ptr<ui::X11AtomCache> atom_cache_;
+ std::unique_ptr<ui::X11AtomCache> atom_cache_;
DISALLOW_COPY_AND_ASSIGN(X11PropertyChangeWaiter);
};
« no previous file with comments | « ui/views/test/webview_test_helper.h ('k') | ui/views/touchui/touch_selection_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698