Bug 1285464 - Keep focus handling in the chrome process so focus will move back to the content out of the typeahead findbar but not change which chrome window has focus. r=mikedeboer

MozReview-Commit-ID: Ga8QFFgX0ZZ

--HG--
extra : rebase_source : 51053e8f539e7d358bd16c36b30bb72fef2ecaa1

toolkit/content/widgets/findbar.xml

@@ -762,6 +762,9 @@
             this.setAttribute("noanim", true);
           this.hidden = true;
 
+          // 'focusContent()' iterates over all listeners in the chrome
+          // process, so we need to call it from here.
+          this.browser.finder.focusContent();
           this.browser.finder.onFindbarClose();
 
           this._cancelTimers();

toolkit/modules/Finder.jsm

@@ -297,7 +297,6 @@ Finder.prototype = {
   },
 
   onFindbarClose: function() {
-    this.focusContent();
     this.enableSelection();
     this.highlighter.highlight(false);
   },