Move cookies tree model helper code into cookies_tree_model_util.

chrome/browser/ui/webui/options/cookies_view_handler.cc

Index: chrome/browser/ui/webui/options/cookies_view_handler.cc
diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc
index 4759c333cbc7bc3184da97fee489b5cfd48a0a0f..b79056dc5189027d9c53f74dfd1c6fffd5562c5f 100644
--- a/chrome/browser/ui/webui/options/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc
@@ -4,10 +4,6 @@
 
 #include "chrome/browser/ui/webui/options/cookies_view_handler.h"
 
-#include "base/i18n/time_formatting.h"
-#include "base/string_number_conversions.h"
-#include "base/string_split.h"
-#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data_appcache_helper.h"
@@ -15,185 +11,12 @@
 #include "chrome/browser/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data_local_storage_helper.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/cookies_tree_model_util.h"
 #include "grit/generated_resources.h"
-#include "net/base/cookie_monster.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
-static const char kKeyId[] = "id";
-static const char kKeyTitle[] = "title";
-static const char kKeyIcon[] = "icon";
-static const char kKeyType[] = "type";
-static const char kKeyHasChildren[] = "hasChildren";
-
-static const char kKeyName[] = "name";
-static const char kKeyContent[] = "content";
-static const char kKeyDomain[] = "domain";
-static const char kKeyPath[] = "path";
-static const char kKeySendFor[] = "sendfor";
-static const char kKeyAccessibleToScript[] = "accessibleToScript";
-static const char kKeyDesc[] = "desc";
-static const char kKeySize[] = "size";
-static const char kKeyOrigin[] = "origin";
-static const char kKeyManifest[] = "manifest";
-
-static const char kKeyAccessed[] = "accessed";
-static const char kKeyCreated[] = "created";
-static const char kKeyExpires[] = "expires";
-static const char kKeyModified[] = "modified";
-
-// Encodes a pointer value into a hex string.
-std::string PointerToHexString(const void* pointer) {
-  return base::HexEncode(&pointer, sizeof(pointer));
-}
-
-// Decodes a pointer from a hex string.
-void* HexStringToPointer(const std::string& str) {
-  std::vector<uint8> buffer;
-  if (!base::HexStringToBytes(str, &buffer) ||
-      buffer.size() != sizeof(void*)) {
-    return NULL;
-  }
-
-  return *reinterpret_cast<void**>(&buffer[0]);
-}
-
-// Populate given |dict| with cookie tree node properties.
-void GetCookieTreeNodeDictionary(const CookieTreeNode& node,
-                                 DictionaryValue* dict) {
-  // Use node's address as an id for WebUI to look it up.
-  dict->SetString(kKeyId, PointerToHexString(&node));
-  dict->SetString(kKeyTitle, node.GetTitle());
-  dict->SetBoolean(kKeyHasChildren, !!node.GetChildCount());
-
-  switch (node.GetDetailedInfo().node_type) {
-    case CookieTreeNode::DetailedInfo::TYPE_ORIGIN: {
-      dict->SetString(kKeyType, "origin");
-#if defined(OS_MACOSX)
-      dict->SetString(kKeyIcon, "chrome://theme/IDR_BOOKMARK_BAR_FOLDER");
-#endif
-      break;
-    }
-    case CookieTreeNode::DetailedInfo::TYPE_COOKIE: {
-      dict->SetString(kKeyType, "cookie");
-      dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_ICON");
-
-      const net::CookieMonster::CanonicalCookie& cookie =
-          *node.GetDetailedInfo().cookie;
-
-      dict->SetString(kKeyName, cookie.Name());
-      dict->SetString(kKeyContent, cookie.Value());
-      dict->SetString(kKeyDomain, cookie.Domain());
-      dict->SetString(kKeyPath, cookie.Path());
-      dict->SetString(kKeySendFor, cookie.IsSecure() ?
-          l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_SENDFOR_SECURE) :
-          l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_SENDFOR_ANY));
-      std::string accessible = cookie.IsHttpOnly() ?
-          l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_ACCESSIBLE_TO_SCRIPT_NO) :
-          l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_ACCESSIBLE_TO_SCRIPT_YES);
-      dict->SetString(kKeyAccessibleToScript, accessible);
-      dict->SetString(kKeyCreated, UTF16ToUTF8(
-          base::TimeFormatFriendlyDateAndTime(cookie.CreationDate())));
-      dict->SetString(kKeyExpires, cookie.DoesExpire() ? UTF16ToUTF8(
-          base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate())) :
-          l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_EXPIRES_SESSION));
-
-      break;
-    }
-    case CookieTreeNode::DetailedInfo::TYPE_DATABASE: {
-      dict->SetString(kKeyType, "database");
-      dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_STORAGE_ICON");
-
-      const BrowsingDataDatabaseHelper::DatabaseInfo& database_info =
-          *node.GetDetailedInfo().database_info;
-
-      dict->SetString(kKeyName, database_info.database_name.empty() ?
-          l10n_util::GetStringUTF8(IDS_COOKIES_WEB_DATABASE_UNNAMED_NAME) :
-          database_info.database_name);
-      dict->SetString(kKeyDesc, database_info.description);
-      dict->SetString(kKeySize,
-          FormatBytes(database_info.size,
-                      GetByteDisplayUnits(database_info.size),
-                      true));
-      dict->SetString(kKeyModified, UTF16ToUTF8(
-          base::TimeFormatFriendlyDateAndTime(database_info.last_modified)));
-
-      break;
-    }
-    case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE: {
-      dict->SetString(kKeyType, "local_storage");
-      dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_STORAGE_ICON");
-
-      const BrowsingDataLocalStorageHelper::LocalStorageInfo&
-         local_storage_info = *node.GetDetailedInfo().local_storage_info;
-
-      dict->SetString(kKeyOrigin, local_storage_info.origin);
-      dict->SetString(kKeySize,
-          FormatBytes(local_storage_info.size,
-                      GetByteDisplayUnits(local_storage_info.size),
-                      true));
-      dict->SetString(kKeyModified, UTF16ToUTF8(
-          base::TimeFormatFriendlyDateAndTime(
-              local_storage_info.last_modified)));
-
-      break;
-    }
-    case CookieTreeNode::DetailedInfo::TYPE_APPCACHE: {
-      dict->SetString(kKeyType, "app_cache");
-      dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_STORAGE_ICON");
-
-      const appcache::AppCacheInfo& appcache_info =
-          *node.GetDetailedInfo().appcache_info;
-
-      dict->SetString(kKeyManifest, appcache_info.manifest_url.spec());
-      dict->SetString(kKeySize,
-          FormatBytes(appcache_info.size,
-                      GetByteDisplayUnits(appcache_info.size),
-                      true));
-      dict->SetString(kKeyCreated, UTF16ToUTF8(
-          base::TimeFormatFriendlyDateAndTime(appcache_info.creation_time)));
-      dict->SetString(kKeyAccessed, UTF16ToUTF8(
-          base::TimeFormatFriendlyDateAndTime(appcache_info.last_access_time)));
-
-      break;
-    }
-    case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB: {
-      dict->SetString(kKeyType, "indexed_db");
-      dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_STORAGE_ICON");
-
-      const BrowsingDataIndexedDBHelper::IndexedDBInfo& indexed_db_info =
-          *node.GetDetailedInfo().indexed_db_info;
-
-      dict->SetString(kKeyOrigin, indexed_db_info.origin);
-      dict->SetString(kKeySize,
-          FormatBytes(indexed_db_info.size,
-                      GetByteDisplayUnits(indexed_db_info.size),
-                      true));
-      dict->SetString(kKeyModified, UTF16ToUTF8(
-          base::TimeFormatFriendlyDateAndTime(indexed_db_info.last_modified)));
-
-      break;
-    }
-    default:
-#if defined(OS_MACOSX)
-      dict->SetString(kKeyIcon, "chrome://theme/IDR_BOOKMARK_BAR_FOLDER");
-#endif
-      break;
-  }
-}
-
-// Append the children nodes of |parent| in specified range to |nodes| list.
-void GetChildNodeList(CookieTreeNode* parent, int start, int count,
-                      ListValue* nodes) {
-  for (int i = 0; i < count; ++i) {
-    DictionaryValue* dict = new DictionaryValue;
-    CookieTreeNode* child = parent->GetChild(start + i);
-    GetCookieTreeNodeDictionary(*child, dict);
-    nodes->Append(dict);
-  }
-}
-
 // TODO(xiyuan): Remove this function when strings are updated.
 // Remove "&" in button label for WebUI.
 string16 CleanButtonLabel(const string16& text) {
@@ -294,13 +117,17 @@ void CookiesViewHandler::TreeNodesAdded(ui::TreeModel* model,
   if (batch_update_)
     return;
 
+  CookieTreeNode* parend_node = cookies_tree_model_->AsNode(parent);

[Mike Mammarella, 2011/03/04 01:05:12]

parent_node?

[xiyuan, 2011/03/04 17:00:44]

Oops. Fixed. :p

+
   ListValue* children = new ListValue;
-  GetChildNodeList(cookies_tree_model_->AsNode(parent), start, count, children);
+  cookies_tree_model_util::GetChildNodeList(parend_node, start, count,
+                                            children);
 
   ListValue args;
   args.Append(parent == cookies_tree_model_->GetRoot() ?
       Value::CreateNullValue() :
-      Value::CreateStringValue(PointerToHexString(parent)));
+      Value::CreateStringValue(
+          cookies_tree_model_util::GetTreeNodeId(parend_node)));
   args.Append(Value::CreateIntegerValue(start));
   args.Append(children);
   web_ui_->CallJavascriptFunction(L"CookiesView.onTreeItemAdded", args);
@@ -317,7 +144,8 @@ void CookiesViewHandler::TreeNodesRemoved(ui::TreeModel* model,
   ListValue args;
   args.Append(parent == cookies_tree_model_->GetRoot() ?
       Value::CreateNullValue() :
-      Value::CreateStringValue(PointerToHexString(parent)));
+      Value::CreateStringValue(cookies_tree_model_util::GetTreeNodeId(
+          cookies_tree_model_->AsNode(parent))));
   args.Append(Value::CreateIntegerValue(start));
   args.Append(Value::CreateIntegerValue(count));
   web_ui_->CallJavascriptFunction(L"CookiesView.onTreeItemRemoved", args);
@@ -366,7 +194,8 @@ void CookiesViewHandler::Remove(const ListValue* args) {
     return;
   }
 
-  CookieTreeNode* node = GetTreeNodeFromPath(node_path);
+  CookieTreeNode* node = cookies_tree_model_util::GetTreeNodeFromPath(
+      cookies_tree_model_->GetRoot(), node_path);
   if (node)
     cookies_tree_model_->DeleteCookieNode(node);
 }
@@ -377,43 +206,21 @@ void CookiesViewHandler::LoadChildren(const ListValue* args) {
     return;
   }
 
-  CookieTreeNode* node = GetTreeNodeFromPath(node_path);
+  CookieTreeNode* node = cookies_tree_model_util::GetTreeNodeFromPath(
+      cookies_tree_model_->GetRoot(), node_path);
   if (node)
     SendChildren(node);
 }
 
-CookieTreeNode* CookiesViewHandler::GetTreeNodeFromPath(
-    const std::string& path) {
-  std::vector<std::string> node_ids;
-  base::SplitString(path, ',', &node_ids);
-
-  CookieTreeNode* child = NULL;
-  CookieTreeNode* parent = cookies_tree_model_->GetRoot();
-  int child_index = -1;
-
-  // Validate the tree path and get the node pointer.
-  for (size_t i = 0; i < node_ids.size(); ++i) {
-    child = reinterpret_cast<CookieTreeNode*>(
-        HexStringToPointer(node_ids[i]));
-
-    child_index = parent->IndexOfChild(child);
-    if (child_index == -1)
-      break;
-
-    parent = child;
-  }
-
-  return child_index >= 0 ? child : NULL;
-}
-
 void CookiesViewHandler::SendChildren(CookieTreeNode* parent) {
   ListValue* children = new ListValue;
-  GetChildNodeList(parent, 0, parent->GetChildCount(), children);
+  cookies_tree_model_util::GetChildNodeList(parent, 0, parent->GetChildCount(),
+      children);
 
   ListValue args;
   args.Append(parent == cookies_tree_model_->GetRoot() ?
       Value::CreateNullValue() :
-      Value::CreateStringValue(PointerToHexString(parent)));
+      Value::CreateStringValue(cookies_tree_model_util::GetTreeNodeId(parent)));
   args.Append(children);
 
   web_ui_->CallJavascriptFunction(L"CookiesView.loadChildren", args);