move some logic from background to content page

2 files changed, 4 insertions, 15 deletions

diff --git a/background_page.html b/background_page.html
index bca446a6..97017fad 100644
--- a/background_page.html
+++ b/background_page.html
@@ -291,8 +291,6 @@
     chrome.bookmarks.getTree(function(bookmarks) {
       var results = [];
       traverseTree(bookmarks, function(bookmark) {
-        if (typeof bookmark.url === "undefined")
-          return;
         results.push(bookmark);
       });
       port.postMessage({bookmarks:results});
@@ -302,19 +300,8 @@
   function getHistory(args, port) {
     chrome.history.search({ text: '',
                             maxResults: args.maxResults || 1000 },
-                      function(history) {
-      // sort by visit cound descending
-      history.sort(function(a, b) {
-        // visitCount may be undefined
-        var visitCountForA = a.visitCount || 0;
-        var visitCountForB = a.visitCount || 0;
-        return visitCountForB - visitCountForA;
-      });
-      var results = [];
-      for (var i = 0; i < history.length; ++i) {
-        results.push(history[i]);
-      }
-      port.postMessage({history:results});
+                          function(history) {
+      port.postMessage({history:history});
     });
   };
 
diff --git a/lib/completion.js b/lib/completion.js
index d0c798c8..1eb87d51 100644
--- a/lib/completion.js
+++ b/lib/completion.js
@@ -356,6 +356,8 @@ var completion = (function() {
 
       for (var i = 0; i < msg.bookmarks.length; ++i) {
         var bookmark = msg.bookmarks[i];
+        if (bookmark.url === undefined)
+          continue;
 
         var title = '';
         if (bookmark.title.length > 0)