feat(addon): #763 SearchProvider adds and removes form history

mozilla · May 30, 2016 · 2b2e8e6 · 2b2e8e6
1 parent 0ef6ea7
commit 2b2e8e6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/common/action-manager.js b/common/action-manager.js
@@ -23,6 +23,7 @@ const am = new ActionManager([
   "RECEIVE_CURRENT_ENGINE",
   "SEARCH_STATE_REQUEST",
   "SEARCH_STATE_RESPONSE",
+  "NOTIFY_REMOVE_FORM_HISTORY_ENTRY",
   "NOTIFY_ROUTE_CHANGE",
   "NOTIFY_PERFORMANCE",
   "NOTIFY_USER_EVENT"

diff --git a/lib/ActivityStreams.js b/lib/ActivityStreams.js
@@ -182,6 +182,13 @@ ActivityStreams.prototype = {
           SearchProvider.search.performSearch(browser, searchData);
         });
         break;
+      case am.type("NOTIFY_REMOVE_FORM_HISTORY_ENTRY"): //eslint-disable-line
+        let win = windowMediator.getMostRecentWindow("navigator:browser");
+        let gBrowser = win.getBrowser();
+        let browser = gBrowser.selectedBrowser;
+        let entry = msg.data;
+        SearchProvider.search.removeFormHistoryEntry(browser, entry);
+        break;
     }
   },
 
@@ -249,6 +256,7 @@ ActivityStreams.prototype = {
     this.on(am.type("NOTIFY_UNBLOCK_ALL"), this._respondToPlacesRequests);
     this.on(am.type("NOTIFY_BOOKMARK_DELETE"), this._respondToPlacesRequests);
     this.on(am.type("SEARCH_STATE_REQUEST"), this._respondToSearchRequests);
+    this.on(am.type("NOTIFY_REMOVE_FORM_HISTORY_ENTRY"), this._respondToSearchRequests);
     this.on(am.type("NOTIFY_PERFORM_SEARCH"), this._respondToSearchRequests);
     this.on(am.type("NOTIFY_ROUTE_CHANGE"), this._onRouteChange);
     this.on(am.type("NOTIFY_USER_EVENT"), this._handleUserEvent);
@@ -276,6 +284,7 @@ ActivityStreams.prototype = {
     this.off(am.type("NOTIFY_UNBLOCK_ALL"), this._respondToPlacesRequests);
     this.off(am.type("NOTIFY_BOOKMARK_DELETE"), this._respondToPlacesRequests);
     this.off(am.type("SEARCH_STATE_REQUEST"), this._respondToSearchRequests);
+    this.off(am.type("NOTIFY_REMOVE_FORM_HISTORY_ENTRY"), this._respondToSearchRequests);
     this.off(am.type("NOTIFY_PERFORM_SEARCH"), this._respondToSearchRequests);
     this.off(am.type("NOTIFY_ROUTE_CHANGE"), this._onRouteChange);
     this.off(am.type("NOTIFY_USER_EVENT"), this._handleUserEvent);

diff --git a/lib/SearchProvider.js b/lib/SearchProvider.js
@@ -50,6 +50,16 @@ NewTabSearchProvider.prototype = {
     Services.obs.removeObserver(this, CURRENT_ENGINE, true);
   },
 
+  removeFormHistoryEntry(browser, entry) {
+    if ("removeFormHistoryEntry" in ContentSearch) {
+      // ContentSearch.jsm from Firefox 49+
+      ContentSearch.removeFormHistoryEntry({target: browser}, entry);
+    } else {
+      // legacy ContentSearch
+      ContentSearch._onMessageRemoveFormHistoryEntry({target: browser}, entry);
+    }
+  },
+
   get state() {
     return Task.spawn(function*() {
       let state;
@@ -69,8 +79,16 @@ NewTabSearchProvider.prototype = {
   },
 
   performSearch(browser, searchData) {
-   ContentSearch._onMessageSearch({target: browser}, searchData);
- },
+    if ("performSearch" in ContentSearch) {
+      // ContentSearch.jsm from Firefox 49+
+      ContentSearch.performSearch({target: browser}, searchData);
+      ContentSearch.addFormHistoryEntry({target: browser}, searchData.searchString);
+    } else {
+      // legacy ContentSearch
+      ContentSearch._onMessageSearch({target: browser}, searchData);
+      ContentSearch._onMessageAddFormHistoryEntry({target: browser}, searchData);
+    }
+  },
 };
 
 const gSearch = new NewTabSearchProvider();