Site Settings Desktop: Polish the Site Data section.

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 70 matching lines @@
   // Skip if there is a batch update in progress.
   if (batch_update_)
     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());
+  // Passing false for |include_quota_nodes| since they don't reflect reality
+  // until bug http://crbug.com/642955 is fixed and local/session storage is
+  // counted against the total.
+  model_util_->GetChildNodeList(
+      parent_node, start, count, /*include_quota_nodes=*/false, children.get());
 
   base::DictionaryValue args;
   if (parent == tree_model->GetRoot())
     args.Set(kId, base::Value::CreateNullValue());
   else
     args.SetString(kId, model_util_->GetTreeNodeId(parent_node));
   args.SetInteger(kStart, start);
   args.Set(kChildren, std::move(children));
   CallJavascriptFunction("cr.webUIListenerCallback",
                          base::StringValue("onTreeItemAdded"),
@@ skipping 112 matching lines @@
   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());
+  // Passing false for |include_quota_nodes| since they don't reflect reality
+  // until bug http://crbug.com/642955 is fixed and local/session storage is
+  // counted against the total.
+  model_util_->GetChildNodeList(parent, /*start=*/0, parent->child_count(),
+      /*include_quota_nodes=*/false, children.get());
 
   base::DictionaryValue args;
   if (parent == cookies_tree_model_->GetRoot())
     args.Set(kId, base::Value::CreateNullValue());
   else
     args.SetString(kId, model_util_->GetTreeNodeId(parent));
   args.Set(kChildren, std::move(children));
 
   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