Chromium Code Reviews Chromium Code Reviews
Issue 10966025:
Change bookmarkManager API from experimental to private. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| OLD | NEW |
|---|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html> | 2 <html> |
| 3 <head> | 3 <head> |
| 4 <!-- TODO(arv): Check in Closure unit tests and make this run as part of the | 4 <!-- TODO(arv): Check in Closure unit tests and make this run as part of the |
| 5 tests --> | 5 tests --> |
| 6 <script src="http://closure-library.googlecode.com/svn/trunk/closure/goog/base.j s"></script> | 6 <script src="http://closure-library.googlecode.com/svn/trunk/closure/goog/base.j s"></script> |
| 7 <script src="cr.js"></script> | 7 <script src="cr.js"></script> |
| 8 <script src="cr/promise.js"></script> | 8 <script src="cr/promise.js"></script> |
| 9 <script src="bmm/treeiterator.js"></script> | 9 <script src="bmm/treeiterator.js"></script> |
| 10 <script src="bmm.js"></script> | 10 <script src="bmm.js"></script> |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 children: [ | 25 children: [ |
| 26 {id: 2}, | 26 {id: 2}, |
| 27 {id: 3, children: []} | 27 {id: 3, children: []} |
| 28 ] | 28 ] |
| 29 }, | 29 }, |
| 30 {id: 4}, | 30 {id: 4}, |
| 31 {id: 5} | 31 {id: 5} |
| 32 ] | 32 ] |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 // Mock chrome.experimental.bookmarkManager.getSubtree | 35 // Mock chrome.bookmarkManager.getSubtree |
| 36 chrome = chrome || {}; | 36 chrome = chrome || {}; |
| 37 chrome.experimental = chrome.experimental || {}; | 37 chrome.experimental = chrome.experimental || {}; |
|
not at google - send to devlin
2012/09/21 00:55:40
This should be unnecessary now.
Tom Sepez
2012/09/21 00:58:16
Still need this line?
Aaron Boodman
2012/09/21 01:37:40
Done.
Aaron Boodman
2012/09/21 01:37:40
Done.
| |
| 38 chrome.experimental.bookmarkManager = chrome.experimental.bookmarkManager || {}; | 38 chrome.bookmarkManager = chrome.bookmarkManager || {}; |
| 39 | 39 |
| 40 var callbacks = {}; | 40 var callbacks = {}; |
| 41 | 41 |
| 42 chrome.experimental.bookmarkManager.getSubtree = function(id, foldersOnly, | 42 chrome.bookmarkManager.getSubtree = function(id, foldersOnly, callback) { |
| 43 callback) { | |
| 44 callbacks[id] = callbacks[id] || []; | 43 callbacks[id] = callbacks[id] || []; |
| 45 callbacks[id].push(callback); | 44 callbacks[id].push(callback); |
| 46 callbacks[id].$calls = callbacks[id].$calls ? callbacks[id].$calls++ : 1; | 45 callbacks[id].$calls = callbacks[id].$calls ? callbacks[id].$calls++ : 1; |
| 47 }; | 46 }; |
| 48 | 47 |
| 49 chrome.experimental.bookmarkManager.getSubtree.load = function(node) { | 48 chrome.bookmarkManager.getSubtree.load = function(node) { |
| 50 // getSubtree gets the root tree when id is ''. | 49 // getSubtree gets the root tree when id is ''. |
| 51 var id = node.id; | 50 var id = node.id; |
| 52 if (id == tree.id) | 51 if (id == tree.id) |
| 53 id = ''; | 52 id = ''; |
| 54 for (var i = 0; i < callbacks[id].length; i++) { | 53 for (var i = 0; i < callbacks[id].length; i++) { |
| 55 callbacks[id][i].call(null, [node]); | 54 callbacks[id][i].call(null, [node]); |
| 56 } | 55 } |
| 57 }; | 56 }; |
| 58 | 57 |
| 59 function setUp() { | 58 function setUp() { |
| 60 callbacks = {} | 59 callbacks = {} |
| 61 } | 60 } |
| 62 | 61 |
| 63 function testLoadSingle() { | 62 function testLoadSingle() { |
| 64 var calls = 0; | 63 var calls = 0; |
| 65 function f(node) { | 64 function f(node) { |
| 66 calls++; | 65 calls++; |
| 67 assertEquals(tree, node); | 66 assertEquals(tree, node); |
| 68 } | 67 } |
| 69 var p = bmm.loadTree(); | 68 var p = bmm.loadTree(); |
| 70 p.addListener(f); | 69 p.addListener(f); |
| 71 | 70 |
| 72 chrome.experimental.bookmarkManager.getSubtree.load(tree); | 71 chrome.bookmarkManager.getSubtree.load(tree); |
| 73 | 72 |
| 74 assertEquals(1, calls); | 73 assertEquals(1, calls); |
| 75 assertEquals(1, callbacks[''].$calls); | 74 assertEquals(1, callbacks[''].$calls); |
| 76 } | 75 } |
| 77 | 76 |
| 78 function testLoadMultiple() { | 77 function testLoadMultiple() { |
| 79 var calls1 = 0; | 78 var calls1 = 0; |
| 80 var calls2 = 0; | 79 var calls2 = 0; |
| 81 function f1(node) { | 80 function f1(node) { |
| 82 calls1++; | 81 calls1++; |
| 83 assertEquals(tree, node); | 82 assertEquals(tree, node); |
| 84 } | 83 } |
| 85 function f2(node) { | 84 function f2(node) { |
| 86 calls2++; | 85 calls2++; |
| 87 assertEquals(tree, node); | 86 assertEquals(tree, node); |
| 88 } | 87 } |
| 89 | 88 |
| 90 var p = bmm.loadTree(); | 89 var p = bmm.loadTree(); |
| 91 var p2 = bmm.loadTree(); | 90 var p2 = bmm.loadTree(); |
| 92 p.addListener(f1); | 91 p.addListener(f1); |
| 93 p2.addListener(f2); | 92 p2.addListener(f2); |
| 94 | 93 |
| 95 chrome.experimental.bookmarkManager.getSubtree.load(tree); | 94 chrome.bookmarkManager.getSubtree.load(tree); |
| 96 | 95 |
| 97 assertEquals(1, calls1); | 96 assertEquals(1, calls1); |
| 98 assertEquals(1, calls2); | 97 assertEquals(1, calls2); |
| 99 assertEquals(1, callbacks[''].$calls); | 98 assertEquals(1, callbacks[''].$calls); |
| 100 } | 99 } |
| 101 | 100 |
| 102 function testLoadSubtree() { | 101 function testLoadSubtree() { |
| 103 var calls = 0; | 102 var calls = 0; |
| 104 function f(node) { | 103 function f(node) { |
| 105 calls++; | 104 calls++; |
| 106 assertEquals(tree.children[0], node); | 105 assertEquals(tree.children[0], node); |
| 107 } | 106 } |
| 108 var p = bmm.loadSubtree(1); | 107 var p = bmm.loadSubtree(1); |
| 109 p.addListener(f); | 108 p.addListener(f); |
| 110 | 109 |
| 111 chrome.experimental.bookmarkManager.getSubtree.load(tree.children[0]); | 110 chrome.bookmarkManager.getSubtree.load(tree.children[0]); |
| 112 | 111 |
| 113 assertEquals(1, calls); | 112 assertEquals(1, calls); |
| 114 assertEquals(1, callbacks[1].$calls); | 113 assertEquals(1, callbacks[1].$calls); |
| 115 } | 114 } |
| 116 | 115 |
| 117 </script> | 116 </script> |
| 118 </body> | 117 </body> |
| 119 </html> | 118 </html> |
| OLD | NEW |
