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

Unified Diff: chrome/browser/ui/webui/chromeos/first_run/first_run_actor.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/ui/webui/chromeos/first_run/first_run_actor.cc
diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_actor.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_actor.cc
index 77893ffb73108b537c593a5274b863f7e17b893f..da8840f5ffa738e573c0c4a20775b2b5c69e6e82 100644
--- a/chrome/browser/ui/webui/chromeos/first_run/first_run_actor.cc
+++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_actor.cc
@@ -6,6 +6,7 @@
#include <limits>
+#include "base/memory/ptr_util.h"
#include "base/values.h"
namespace {
@@ -42,7 +43,8 @@ FirstRunActor::StepPosition& FirstRunActor::StepPosition::SetLeft(int left) {
return *this;
}
-scoped_ptr<base::DictionaryValue> FirstRunActor::StepPosition::AsValue() const {
+std::unique_ptr<base::DictionaryValue> FirstRunActor::StepPosition::AsValue()
+ const {
base::DictionaryValue* result = new base::DictionaryValue();
if (top_ != kNoneValue)
result->SetInteger("top", top_);
@@ -52,7 +54,7 @@ scoped_ptr<base::DictionaryValue> FirstRunActor::StepPosition::AsValue() const {
result->SetInteger("bottom", bottom_);
if (left_ != kNoneValue)
result->SetInteger("left", left_);
- return make_scoped_ptr(result);
+ return base::WrapUnique(result);
}
FirstRunActor::FirstRunActor()

Powered by Google App Engine
This is Rietveld 408576698