wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1191520: Hide the search settings footer in non-nightly builds. r=adw

Browse Source
This commit is contained in:
Dave Townsend 2015-08-05 15:11:15 -07:00
parent 0121fa196f
commit 419d7a6dc2
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/browser.xul
View File

@ -147,10 +147,12 @@
<!-- for url bar autocomplete -->
<panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true">
#ifdef NIGHTLY_BUILD
<hbox id="urlbar-search-footer" flex="1" align="stretch" pack="end">
<button id="urlbar-search-settings" label="&changeSearchSettings.button;"
oncommand="BrowserUITelemetry.countSearchSettingsEvent('urlbar'); openPreferences('paneSearch')"/>
</hbox>
#endif
</panel>
<!-- for select dropdowns. The menupopup is what shows the list of options,

8
browser/base/content/test/general/browser_urlbar_searchsettings.js
View File

@ -4,6 +4,12 @@
"use strict";
add_task(function*() {
let button = document.getElementById("urlbar-search-settings");
if (!button) {
ok("Skipping test");
return;
}
yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank" }, function* () {
let popupopened = BrowserTestUtils.waitForEvent(gURLBar.popup, "popupshown");
@ -14,7 +20,7 @@ add_task(function*() {
// Since the current tab is blank the preferences pane will load there
let loaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
let popupclosed = BrowserTestUtils.waitForEvent(gURLBar.popup, "popuphidden");
EventUtils.synthesizeMouseAtCenter(document.getElementById("urlbar-search-settings"), {});
EventUtils.synthesizeMouseAtCenter(button, {});
yield loaded;
yield popupclosed;

2
browser/base/moz.build
View File

@ -27,6 +27,8 @@ BROWSER_CHROME_MANIFESTS += [
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
DEFINES['NIGHTLY_BUILD'] = CONFIG['NIGHTLY_BUILD']
DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):