Added option to bookmarkManagerPrivate.getMetaInfo() to get meta info from all bookmarks in a one f…

chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 648 matching lines @@
           GetChromeBookmarkClient(), node, false, false));
   results_ = CreateWithMetaInfo::Results::Create(*result_node);
 
   return true;
 }
 
 bool BookmarkManagerPrivateGetMetaInfoFunction::RunOnReady() {
   scoped_ptr<GetMetaInfo::Params> params(GetMetaInfo::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
-  const BookmarkNode* node = GetBookmarkNodeFromId(params->id);
-  if (!node)
-    return false;
+  if (params->id) {
+    const BookmarkNode* node = GetBookmarkNodeFromId(*params->id);
+    if (!node)
+      return false;
 
-  if (params->key) {
-    std::string value;
-    if (node->GetMetaInfo(*params->key, &value)) {
+    if (params->key) {
+      std::string value;
+      if (node->GetMetaInfo(*params->key, &value)) {
+        GetMetaInfo::Results::Value result;
+        result.as_string.reset(new std::string(value));
+        results_ = GetMetaInfo::Results::Create(result);
+      }
+    } else {
       GetMetaInfo::Results::Value result;
-      result.as_string.reset(new std::string(value));
+      result.as_meta_info_fields.reset(
+          new bookmark_manager_private::MetaInfoFields);
+
+      const BookmarkNode::MetaInfoMap* meta_info = node->GetMetaInfoMap();
+      if (meta_info)
+        result.as_meta_info_fields->additional_properties = *meta_info;
       results_ = GetMetaInfo::Results::Create(result);
     }
   } else {

[Mike Wittman, 2014/06/16 17:47:34]

If we're not supporting the case where a key is specified, but no id, we should
generate an error.

[yefimt, 2014/06/16 19:04:01]

Done.

+    BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
+    const BookmarkNode* node = model->root_node();
+
     GetMetaInfo::Results::Value result;
-    result.as_meta_info_fields.reset(
-        new bookmark_manager_private::MetaInfoFields);
+    result.as_map_meta_info_fields.reset(
+        new bookmark_manager_private::MapMetaInfoFields);
 
-    const BookmarkNode::MetaInfoMap* meta_info = node->GetMetaInfoMap();
-    if (meta_info)
-      result.as_meta_info_fields->additional_properties = *meta_info;
+    bookmark_api_helpers::GetMetaInfo(node,
+        &result.as_map_meta_info_fields->additional_properties);
+
     results_ = GetMetaInfo::Results::Create(result);
   }
 
   return true;
 }
 
 bool BookmarkManagerPrivateSetMetaInfoFunction::RunOnReady() {
   scoped_ptr<SetMetaInfo::Params> params(SetMetaInfo::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ skipping 94 matching lines @@
   result.enabled = undo_manager->redo_count() > 0;
   result.label = base::UTF16ToUTF8(undo_manager->GetRedoLabel());
 
   results_ = RedoInfo::Results::Create(result);
 #endif  // !defined(OS_ANDROID)
 
   return true;
 }
 
 }  // namespace extensions