Extension API Renaming/Consistency changes

chrome/browser/extensions/extension_bookmarks_module.cc

 // Copyright (c) 2009 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/extension_bookmarks_module.h"
 
 #include "base/json_writer.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 185 matching lines @@
   const BookmarkNode* node = parent->GetChild(index);
   args.Append(new StringValue(Int64ToString(node->id())));
   DictionaryValue* obj = ExtensionBookmarks::GetNodeDictionary(node, false);
 
   // Remove id since it's already being passed as the first argument.
   obj->Remove(keys::kIdKey, NULL);
   args.Append(obj);
 
   std::string json_args;
   JSONWriter::Write(&args, false, &json_args);
-  DispatchEvent(model->profile(), keys::kOnBookmarkAdded, json_args);
+  DispatchEvent(model->profile(), keys::kOnBookmarkCreated, json_args);
 }
 
 void ExtensionBookmarkEventRouter::BookmarkNodeRemoved(
     BookmarkModel* model,
     const BookmarkNode* parent,
     int index,
     const BookmarkNode* node) {
   ListValue args;
   args.Append(new StringValue(Int64ToString(node->id())));
   DictionaryValue* object_args = new DictionaryValue();
@@ skipping 34 matching lines @@
     BookmarkModel* model, const BookmarkNode* node) {
   ListValue args;
   args.Append(new StringValue(Int64ToString(node->id())));
   int childCount = node->GetChildCount();
   ListValue* children = new ListValue();
   for (int i = 0; i < childCount; ++i) {
     const BookmarkNode* child = node->GetChild(i);
     Value* child_id = new StringValue(Int64ToString(child->id()));
     children->Append(child_id);
   }
-  args.Append(children);
+  DictionaryValue* reorder_info = new DictionaryValue();
+  reorder_info->Set(keys::kChildIdsKey, children);
+  args.Append(reorder_info);
 
   std::string json_args;
   JSONWriter::Write(&args, false, &json_args);
   DispatchEvent(model->profile(),
                 keys::kOnBookmarkChildrenReordered,
                 json_args);
 }
 
 bool GetBookmarksFunction::RunImpl() {
   BookmarkModel* model = profile()->GetBookmarkModel();
@@ skipping 264 matching lines @@
   }
   if (node == model->root_node() ||
       node == model->other_node() ||
       node == model->GetBookmarkBarNode()) {
     error_ = keys::kModifySpecialError;
     return false;
   }
   model->SetTitle(node, title);
   return true;
 }