| Index: chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
|
| index 63f40e7be4c04cf0064ad81725ecabec5629dcc1..8ccc5aad37d12060d1e356e099a71bb3b090f66f 100644
|
| --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
|
| +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
|
| @@ -162,9 +162,8 @@ CreateApiBookmarkNodeData(Profile* profile, const BookmarkNodeData& data) {
|
| }
|
| } else {
|
| // We do not have a node IDs when the data comes from a different profile.
|
| - std::vector<BookmarkNodeData::Element> elements = data.elements;
|
| - for (size_t i = 0; i < elements.size(); ++i)
|
| - node_data->elements.push_back(CreateApiNodeDataElement(elements[i]));
|
| + for (size_t i = 0; i < data.num_elements(); ++i)
|
| + node_data->elements.push_back(CreateApiNodeDataElement(data.elements[i]));
|
| }
|
| return node_data.Pass();
|
| }
|
| @@ -309,7 +308,7 @@ void BookmarkManagerPrivateDragEventRouter::DispatchEvent(
|
|
|
| void BookmarkManagerPrivateDragEventRouter::OnDragEnter(
|
| const BookmarkNodeData& data) {
|
| - if (data.size() == 0)
|
| + if (!data.is_valid())
|
| return;
|
| DispatchEvent(bookmark_manager_private::OnDragEnter::kEventName,
|
| bookmark_manager_private::OnDragEnter::Create(
|
| @@ -324,7 +323,7 @@ void BookmarkManagerPrivateDragEventRouter::OnDragOver(
|
|
|
| void BookmarkManagerPrivateDragEventRouter::OnDragLeave(
|
| const BookmarkNodeData& data) {
|
| - if (data.size() == 0)
|
| + if (!data.is_valid())
|
| return;
|
| DispatchEvent(bookmark_manager_private::OnDragLeave::kEventName,
|
| bookmark_manager_private::OnDragLeave::Create(
|
| @@ -333,7 +332,7 @@ void BookmarkManagerPrivateDragEventRouter::OnDragLeave(
|
|
|
| void BookmarkManagerPrivateDragEventRouter::OnDrop(
|
| const BookmarkNodeData& data) {
|
| - if (data.size() == 0)
|
| + if (!data.is_valid())
|
| return;
|
| DispatchEvent(bookmark_manager_private::OnDrop::kEventName,
|
| bookmark_manager_private::OnDrop::Create(
|
|
|