Refactoring CookiesTreeModel to support multiple data sources.

chrome/browser/resources/options2/cookies_list.js

Index: chrome/browser/resources/options2/cookies_list.js
diff --git a/chrome/browser/resources/options2/cookies_list.js b/chrome/browser/resources/options2/cookies_list.js
index 8a4ae577c02f4d747b0f37eddc89e8d827ab04ff..2db5d87e1f250c5ad77c88e1b69f80cb7e787df6 100644
--- a/chrome/browser/resources/options2/cookies_list.js
+++ b/chrome/browser/resources/options2/cookies_list.js
@@ -605,6 +605,11 @@ cr.define('options', function() {
       var parent = this.parent;
       if (parent && parent instanceof CookieTreeNode)
         return parent.pathId + ',' + this.data.id;
+      // TODO(nasko): until the code is modified to account for the "app" level
+      // in the tree model, use this hack of adding the root node id.
+      if ($('cookies-list').rootId)
+        return $('cookies-list').rootId + ',' + this.data.id;
+
       return this.data.id;
     },
   };
@@ -826,8 +831,15 @@ cr.define('options', function() {
      */
     removeByParentId: function(parentId, start, count) {
       var parent = parentId ? parentLookup[parentId] : this;
-      if (!parent)
-        return;
+      if (!parent) {
+        // TODO(nasko): Remove this once the "app" level in the tree model is
+        // accounted for.
+        if (parentId) {

[Evan Stade, 2012/06/21 04:01:41]

I think parentId has to be truthy at this point, because if it were falsey then
|parent| would already equal |this|.

[nasko, 2012/06/21 16:22:12]

Since I've added a new level in the tree, it no longer starts at the root of the
tree, rather at the app level. In this case, the parent ID is valid (not the
root), but also we haven't inserted the parent in the parentLookup.
There will be a follow up CL to display app stored data, so this is one step of
a bigger change.

[Evan Stade, 2012/06/21 18:40:02]

if the parentId is valid then why are you checking it?

[nasko, 2012/06/21 18:49:47]

Because, while there is a parent node (the root node), it is not in the lookup
table. So in the case where we have valid parentId (the app node has parent of
root), but it is not in the lookup table, we want to use the cookie view as the
parent to add items to.

[Evan Stade, 2012/06/22 00:59:47]

I'm not really following you any more. And I don't think you're following me.
Explain to me how the code you have here is any different from:

var parent = parentLookup[parentId] || this;

[nasko, 2012/06/22 17:59:35]

I see what your point is. You are indeed correct.

+          parent = this;
+        } else {
+          return;

[Evan Stade, 2012/06/22 00:59:47]

my point is that this line cannot be reached. It is a logical impossibility.

+        }
+      }
 
       parent.startBatchUpdates();
       while (count-- > 0)
@@ -847,8 +859,15 @@ cr.define('options', function() {
       if (parentId)
         delete lookupRequests[parentId];
       var parent = parentId ? parentLookup[parentId] : this;
-      if (!parent)
-        return;
+      // TODO(nasko): Remove this once the "app" level in the tree model is
+      // accounted for.
+      if (!parent) {
+        if (parentId) {

[Evan Stade, 2012/06/21 04:01:41]

ditto

[nasko, 2012/06/21 16:22:12]

See the above.

+          parent = this;
+        } else {
+          return;
+        }
+      }
 
       parent.startBatchUpdates();
       parent.clear();