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