From 5a55f11e9d725a5591de24366c16d3202058f599 Mon Sep 17 00:00:00 2001 From: jordan9769 Date: Thu, 1 Dec 2016 12:25:32 +0530 Subject: [PATCH] Bug 1310942 - Merge browser-autocomplete-result-popup into browser-search-autocomplete-result-popup; r=mak MozReview-Commit-ID: 2DtwvrsOlQ8 --HG-- extra : rebase_source : 2e2f3bd616ae81ee1130092f28f9a426632e5761 --- browser/base/content/urlbarBindings.xml | 78 -------------------- browser/components/search/content/search.xml | 78 +++++++++++++++++++- 2 files changed, 75 insertions(+), 81 deletions(-) diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml index d1120d227f3f..d4a0ee642d94 100644 --- a/browser/base/content/urlbarBindings.xml +++ b/browser/base/content/urlbarBindings.xml @@ -1259,84 +1259,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - - - - - (Components.utils.import("resource://gre/modules/AppConstants.jsm", {})).AppConstants; - - - - - - - - - - - - - - - - diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml index cdfa2524529a..c8b7d88f9d14 100644 --- a/browser/components/search/content/search.xml +++ b/browser/components/search/content/search.xml @@ -692,8 +692,8 @@ // Initially the panel used for the searchbar (PopupSearchAutoComplete // in browser.xul) is hidden to avoid impacting startup / new // window performance. The base binding's openPopup would normally - // call the overriden openAutocompletePopup in urlbarBindings.xml's - // browser-autocomplete-result-popup binding to unhide the popup, + // call the overriden openAutocompletePopup in + // browser-search-autocomplete-result-popup binding to unhide the popup, // but since we're overriding openPopup we need to unhide the panel // ourselves. popup.hidden = false; @@ -904,7 +904,7 @@ - + @@ -927,6 +927,78 @@ + + (Components.utils.import("resource://gre/modules/AppConstants.jsm", {})).AppConstants; + + + + + + + + + + + + +