Site Settings Desktop: Implement individual cookie removal and RemoveAll.

chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc

 // Copyright 2016 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/ui/webui/settings/settings_cookies_view_handler.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 20 matching lines @@
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_ui.h"
 
 namespace storage {
 class FileSystemContext;
 }
 
 namespace settings {
 
+const char kId[] = "id";
+const char kChildren[] = "children";
+const char kStart[] = "start";
+const char kCount[] = "count";
+
 CookiesViewHandler::CookiesViewHandler()
   : batch_update_(false),
     model_util_(new CookiesTreeModelUtil) {
 }
 
 CookiesViewHandler::~CookiesViewHandler() {
 }
 
 void CookiesViewHandler::OnJavascriptAllowed() {
 }
@@ skipping 28 matching lines @@
     return;
 
   AllowJavascript();
 
   CookiesTreeModel* tree_model = static_cast<CookiesTreeModel*>(model);
   CookieTreeNode* parent_node = tree_model->AsNode(parent);
 
   std::unique_ptr<base::ListValue> children(new base::ListValue);
   model_util_->GetChildNodeList(parent_node, start, count, children.get());
 
-  base::ListValue args;
+  base::DictionaryValue args;
   if (parent == tree_model->GetRoot())
-    args.Append(base::Value::CreateNullValue());
+    args.Set(kId, base::Value::CreateNullValue());
   else
-    args.AppendString(model_util_->GetTreeNodeId(parent_node));
-  args.AppendInteger(start);
-  args.Append(std::move(children));
+    args.SetString(kId, model_util_->GetTreeNodeId(parent_node));
+  args.SetInteger(kStart, start);
+  args.Set(kChildren, std::move(children));
   CallJavascriptFunction("cr.webUIListenerCallback",
                          base::StringValue("onTreeItemAdded"),
                          args);
 }
 
 void CookiesViewHandler::TreeNodesRemoved(ui::TreeModel* model,
                                           ui::TreeModelNode* parent,
                                           int start,
                                           int count) {
   // Skip if there is a batch update in progress.
   if (batch_update_)
     return;
 
   AllowJavascript();
 
   CookiesTreeModel* tree_model = static_cast<CookiesTreeModel*>(model);
 
-  base::ListValue args;
+  base::DictionaryValue args;
   if (parent == tree_model->GetRoot())
-    args.Append(base::Value::CreateNullValue());
+    args.Set(kId, base::Value::CreateNullValue());
   else
-    args.AppendString(model_util_->GetTreeNodeId(tree_model->AsNode(parent)));
-  args.AppendInteger(start);
-  args.AppendInteger(count);
+    args.SetString(kId, model_util_->GetTreeNodeId(tree_model->AsNode(parent)));
+  args.SetInteger(kStart, start);
+  args.SetInteger(kCount, count);
   CallJavascriptFunction("cr.webUIListenerCallback",
                          base::StringValue("onTreeItemRemoved"),
                          args);
 }
 
 void CookiesViewHandler::TreeModelBeginBatch(CookiesTreeModel* model) {
   DCHECK(!batch_update_);  // There should be no nested batch begin.
   batch_update_ = true;
 }
 
@@ skipping 40 matching lines @@
   base::string16 query;
   if (!args->GetString(0, &query))
     return;
 
   EnsureCookiesTreeModelCreated();
 
   cookies_tree_model_->UpdateSearchResults(query);
 }
 
 void CookiesViewHandler::RemoveAll(const base::ListValue* args) {
+  CHECK_EQ(1U, args->GetSize());
+  CHECK(args->GetString(0, &callback_id_));
+
   EnsureCookiesTreeModelCreated();
   cookies_tree_model_->DeleteAllStoredObjects();
 }
 
 void CookiesViewHandler::Remove(const base::ListValue* args) {
   std::string node_path;
   if (!args->GetString(0, &node_path))
     return;
 
   EnsureCookiesTreeModelCreated();
 
   const CookieTreeNode* node = model_util_->GetTreeNodeFromPath(
       cookies_tree_model_->GetRoot(), node_path);
   if (node)
     cookies_tree_model_->DeleteCookieNode(const_cast<CookieTreeNode*>(node));
 }
 
 void CookiesViewHandler::LoadChildren(const base::ListValue* args) {
+  CHECK_LT(0U, args->GetSize());
+  CHECK(args->GetString(0, &callback_id_));
+
   std::string node_path;
-  if (!args->GetString(0, &node_path))
+  if (!args->GetString(1, &node_path))
     return;
 
   EnsureCookiesTreeModelCreated();
 
   const CookieTreeNode* node = model_util_->GetTreeNodeFromPath(
       cookies_tree_model_->GetRoot(), node_path);
   if (node)
     SendChildren(node);
 }
 
 void CookiesViewHandler::SendChildren(const CookieTreeNode* parent) {
   AllowJavascript();
 
   std::unique_ptr<base::ListValue> children(new base::ListValue);
   model_util_->GetChildNodeList(parent, 0, parent->child_count(),
                                 children.get());
 
-  base::ListValue args;
+  base::DictionaryValue args;
   if (parent == cookies_tree_model_->GetRoot())
-    args.Append(base::Value::CreateNullValue());
+    args.Set(kId, base::Value::CreateNullValue());
   else
-    args.AppendString(model_util_->GetTreeNodeId(parent));
-  args.Append(std::move(children));
+    args.SetString(kId, model_util_->GetTreeNodeId(parent));
+  args.Set(kChildren, std::move(children));
 
-  CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("loadChildren"),
-                         args);
+  ResolveJavascriptCallback(base::StringValue(callback_id_), args);
+  callback_id_ = "";
 }
 
 void CookiesViewHandler::ReloadCookies(const base::ListValue* args) {
+  CHECK_EQ(1U, args->GetSize());
+  CHECK(args->GetString(0, &callback_id_));
+
   cookies_tree_model_.reset();
 
   EnsureCookiesTreeModelCreated();
 }
 
 }  // namespace settings