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

Side by Side Diff: chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc

Issue 2777063003: Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions (Closed)
Patch Set: Fix SupervisedUserWhitelistInstaller Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h" 5 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h"
6 6
7 #include <math.h> // For floor() 7 #include <math.h> // For floor()
jdoerrie 2017/04/06 14:25:50 [[newline]] #include <utility>
vabr (Chromium) 2017/04/07 20:40:40 Done.
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ptr_util.h"
10 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
jdoerrie 2017/04/06 14:25:50 #include "base/values.h"
vabr (Chromium) 2017/04/07 20:40:40 Done.
12 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h" 13 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h"
13 #include "chrome/common/extensions/api/bookmarks.h" 14 #include "chrome/common/extensions/api/bookmarks.h"
14 #include "components/bookmarks/browser/bookmark_model.h" 15 #include "components/bookmarks/browser/bookmark_model.h"
15 #include "components/bookmarks/browser/bookmark_utils.h" 16 #include "components/bookmarks/browser/bookmark_utils.h"
16 #include "components/bookmarks/managed/managed_bookmark_service.h" 17 #include "components/bookmarks/managed/managed_bookmark_service.h"
17 18
18 using bookmarks::BookmarkModel; 19 using bookmarks::BookmarkModel;
19 using bookmarks::BookmarkNode; 20 using bookmarks::BookmarkNode;
20 21
21 namespace extensions { 22 namespace extensions {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 model->Remove(node); 145 model->Remove(node);
145 return true; 146 return true;
146 } 147 }
147 148
148 void GetMetaInfo(const BookmarkNode& node, 149 void GetMetaInfo(const BookmarkNode& node,
149 base::DictionaryValue* id_to_meta_info_map) { 150 base::DictionaryValue* id_to_meta_info_map) {
150 if (!node.IsVisible()) 151 if (!node.IsVisible())
151 return; 152 return;
152 153
153 const BookmarkNode::MetaInfoMap* meta_info = node.GetMetaInfoMap(); 154 const BookmarkNode::MetaInfoMap* meta_info = node.GetMetaInfoMap();
154 base::DictionaryValue* value = new base::DictionaryValue(); 155 auto value = base::MakeUnique<base::DictionaryValue>();
155 if (meta_info) { 156 if (meta_info) {
156 BookmarkNode::MetaInfoMap::const_iterator itr; 157 BookmarkNode::MetaInfoMap::const_iterator itr;
157 for (itr = meta_info->begin(); itr != meta_info->end(); ++itr) { 158 for (itr = meta_info->begin(); itr != meta_info->end(); ++itr) {
158 value->SetStringWithoutPathExpansion(itr->first, itr->second); 159 value->SetStringWithoutPathExpansion(itr->first, itr->second);
159 } 160 }
160 } 161 }
161 id_to_meta_info_map->Set(base::Int64ToString(node.id()), value); 162 id_to_meta_info_map->Set(base::Int64ToString(node.id()), std::move(value));
162 163
163 if (node.is_folder()) { 164 if (node.is_folder()) {
164 for (int i = 0; i < node.child_count(); ++i) { 165 for (int i = 0; i < node.child_count(); ++i) {
165 GetMetaInfo(*(node.GetChild(i)), id_to_meta_info_map); 166 GetMetaInfo(*(node.GetChild(i)), id_to_meta_info_map);
166 } 167 }
167 } 168 }
168 } 169 }
169 170
170 } // namespace bookmark_api_helpers 171 } // namespace bookmark_api_helpers
171 } // namespace extensions 172 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698