OLD | NEW |
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() |
| 8 |
| 9 #include <utility> |
8 #include <vector> | 10 #include <vector> |
9 | 11 |
| 12 #include "base/memory/ptr_util.h" |
10 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
11 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 15 #include "base/values.h" |
12 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h" | 16 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h" |
13 #include "chrome/common/extensions/api/bookmarks.h" | 17 #include "chrome/common/extensions/api/bookmarks.h" |
14 #include "components/bookmarks/browser/bookmark_model.h" | 18 #include "components/bookmarks/browser/bookmark_model.h" |
15 #include "components/bookmarks/browser/bookmark_utils.h" | 19 #include "components/bookmarks/browser/bookmark_utils.h" |
16 #include "components/bookmarks/managed/managed_bookmark_service.h" | 20 #include "components/bookmarks/managed/managed_bookmark_service.h" |
17 | 21 |
18 using bookmarks::BookmarkModel; | 22 using bookmarks::BookmarkModel; |
19 using bookmarks::BookmarkNode; | 23 using bookmarks::BookmarkNode; |
20 | 24 |
21 namespace extensions { | 25 namespace extensions { |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 model->Remove(node); | 148 model->Remove(node); |
145 return true; | 149 return true; |
146 } | 150 } |
147 | 151 |
148 void GetMetaInfo(const BookmarkNode& node, | 152 void GetMetaInfo(const BookmarkNode& node, |
149 base::DictionaryValue* id_to_meta_info_map) { | 153 base::DictionaryValue* id_to_meta_info_map) { |
150 if (!node.IsVisible()) | 154 if (!node.IsVisible()) |
151 return; | 155 return; |
152 | 156 |
153 const BookmarkNode::MetaInfoMap* meta_info = node.GetMetaInfoMap(); | 157 const BookmarkNode::MetaInfoMap* meta_info = node.GetMetaInfoMap(); |
154 base::DictionaryValue* value = new base::DictionaryValue(); | 158 auto value = base::MakeUnique<base::DictionaryValue>(); |
155 if (meta_info) { | 159 if (meta_info) { |
156 BookmarkNode::MetaInfoMap::const_iterator itr; | 160 BookmarkNode::MetaInfoMap::const_iterator itr; |
157 for (itr = meta_info->begin(); itr != meta_info->end(); ++itr) { | 161 for (itr = meta_info->begin(); itr != meta_info->end(); ++itr) { |
158 value->SetStringWithoutPathExpansion(itr->first, itr->second); | 162 value->SetStringWithoutPathExpansion(itr->first, itr->second); |
159 } | 163 } |
160 } | 164 } |
161 id_to_meta_info_map->Set(base::Int64ToString(node.id()), value); | 165 id_to_meta_info_map->Set(base::Int64ToString(node.id()), std::move(value)); |
162 | 166 |
163 if (node.is_folder()) { | 167 if (node.is_folder()) { |
164 for (int i = 0; i < node.child_count(); ++i) { | 168 for (int i = 0; i < node.child_count(); ++i) { |
165 GetMetaInfo(*(node.GetChild(i)), id_to_meta_info_map); | 169 GetMetaInfo(*(node.GetChild(i)), id_to_meta_info_map); |
166 } | 170 } |
167 } | 171 } |
168 } | 172 } |
169 | 173 |
170 } // namespace bookmark_api_helpers | 174 } // namespace bookmark_api_helpers |
171 } // namespace extensions | 175 } // namespace extensions |
OLD | NEW |