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

Unified Diff: ui/ozone/common/native_display_delegate_ozone.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/native_theme/native_theme_win.cc ('k') | ui/ozone/common/native_display_delegate_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/common/native_display_delegate_ozone.h
diff --git a/ui/ozone/common/native_display_delegate_ozone.h b/ui/ozone/common/native_display_delegate_ozone.h
index baf2a6cf114b2418a67c18018784a42961db168f..b9cd83654b15d87950da5c38650ea4091dcb36cf 100644
--- a/ui/ozone/common/native_display_delegate_ozone.h
+++ b/ui/ozone/common/native_display_delegate_ozone.h
@@ -7,8 +7,9 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "ui/display/types/native_display_delegate.h"
@@ -55,7 +56,7 @@ class NativeDisplayDelegateOzone : public NativeDisplayDelegate {
void RemoveObserver(NativeDisplayObserver* observer) override;
private:
- std::vector<scoped_ptr<DisplaySnapshot>> displays_;
+ std::vector<std::unique_ptr<DisplaySnapshot>> displays_;
DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateOzone);
};
« no previous file with comments | « ui/native_theme/native_theme_win.cc ('k') | ui/ozone/common/native_display_delegate_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698