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

Unified Diff: ui/display/manager/display_layout_builder.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/display/manager/display_layout.cc ('k') | ui/display/manager/display_layout_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/manager/display_layout_builder.h
diff --git a/ui/display/manager/display_layout_builder.h b/ui/display/manager/display_layout_builder.h
index 9b3caefac62d97dd564d793d20437e95ca3b484d..72d86c07c2da46b3b78d581bd4e1dfca2b1f9edf 100644
--- a/ui/display/manager/display_layout_builder.h
+++ b/ui/display/manager/display_layout_builder.h
@@ -5,8 +5,9 @@
#ifndef UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_BUILDER_H_
#define UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_BUILDER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/display/display_export.h"
#include "ui/display/manager/display_layout.h"
@@ -44,10 +45,10 @@ class DISPLAY_EXPORT DisplayLayoutBuilder final {
int offset);
// Returns the DisplayLayout. After this call, the builder becomes invalid.
- scoped_ptr<DisplayLayout> Build();
+ std::unique_ptr<DisplayLayout> Build();
private:
- scoped_ptr<DisplayLayout> layout_;
+ std::unique_ptr<DisplayLayout> layout_;
DISALLOW_COPY_AND_ASSIGN(DisplayLayoutBuilder);
};
« no previous file with comments | « ui/display/manager/display_layout.cc ('k') | ui/display/manager/display_layout_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698