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

Unified Diff: ash/display/json_converter.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/display/extended_mouse_warp_controller_unittest.cc ('k') | ash/display/json_converter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/json_converter.cc
diff --git a/ash/display/json_converter.cc b/ash/display/json_converter.cc
index 352a2ffae0b8633f4ef42b2132b0b0e82917a197..424cf11418336120def1f073ad79f588bf25f3d6 100644
--- a/ash/display/json_converter.cc
+++ b/ash/display/json_converter.cc
@@ -4,6 +4,7 @@
#include "ash/display/json_converter.h"
+#include <memory>
#include <string>
#include "ash/display/display_pref_util.h"
@@ -178,9 +179,9 @@ bool DisplayLayoutToJson(const display::DisplayLayout& layout,
dict_value->SetBoolean(kDefaultUnifiedKey, layout.default_unified);
dict_value->SetString(kPrimaryIdKey, base::Int64ToString(layout.primary_id));
- scoped_ptr<base::ListValue> placement_list(new base::ListValue);
+ std::unique_ptr<base::ListValue> placement_list(new base::ListValue);
for (const auto& placement : layout.placement_list) {
- scoped_ptr<base::DictionaryValue> placement_value(
+ std::unique_ptr<base::DictionaryValue> placement_value(
new base::DictionaryValue);
placement_value->SetString(
kPositionKey,
« no previous file with comments | « ash/display/extended_mouse_warp_controller_unittest.cc ('k') | ash/display/json_converter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698