Skip to content

Commit ff19d0a

Browse files
committed
Bug 2006632 - Enable the new search bar implementation in Nightly. r=mbeier
Differential Revision: https://phabricator.services.mozilla.com/D276841
1 parent ac87939 commit ff19d0a

File tree

12 files changed

+45
-3
lines changed

12 files changed

+45
-3
lines changed

browser/app/profile/firefox.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,11 @@ pref("browser.search.serpMetricsRecordedCounter", 0);
887887
// days
888888
pref("browser.search.widget.removeAfterDaysUnused", 120);
889889

890+
#ifdef NIGHTLY_BUILD
891+
pref("browser.search.widget.new", true);
892+
#else
890893
pref("browser.search.widget.new", false);
894+
#endif
891895

892896
// The number of times the search function in the URL bar has been used,
893897
// capped at 100.

browser/base/content/test/keyboard/browser_toolbarKeyNav.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ add_setup(async function () {
131131
// onorous and creates issues with existing tests without improving test
132132
// coverage, so disable it herein.
133133
["browser.taskbarTabs.enabled", false],
134+
["browser.search.widget.new", false],
134135
],
135136
});
136137
resetToolbarWithoutDevEditionButtons();

browser/components/customizableui/test/browser_901207_searchbar_in_panel.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ async function waitForSearchBarFocus() {
1818
});
1919
}
2020

21+
add_setup(async function () {
22+
await SpecialPowers.pushPrefEnv({
23+
set: [["browser.search.widget.new", false]],
24+
});
25+
});
26+
2127
// Ctrl+K should open the menu panel and focus the search bar if the search bar is in the panel.
2228
add_task(async function check_shortcut_when_in_closed_overflow_panel_closed() {
2329
CustomizableUI.addWidgetToArea(

browser/components/customizableui/test/browser_913972_currentset_overflow.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ registerCleanupFunction(async function asyncCleanup() {
1010
await resetCustomization();
1111
});
1212

13+
add_setup(async function () {
14+
await SpecialPowers.pushPrefEnv({
15+
set: [["browser.search.widget.new", false]],
16+
});
17+
});
18+
1319
// Default state no longer overflows at minimum window width (bug 1960002).
1420
// Add buttons to trigger overflow, resize to a small window, resize back,
1521
// shouldn't change state.

browser/components/customizableui/test/browser_940307_panel_click_closure_handling.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ add_task(async function plain_button() {
2727
});
2828

2929
add_task(async function searchbar_in_panel() {
30+
SpecialPowers.pushPrefEnv({
31+
set: [["browser.search.widget.new", false]],
32+
});
33+
3034
CustomizableUI.addWidgetToArea(
3135
"search-container",
3236
CustomizableUI.AREA_FIXED_OVERFLOW_PANEL

browser/components/enterprisepolicies/tests/browser/browser_policy_search_engine.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ ChromeUtils.defineESModuleGetters(this, {
1010
let gCUITestUtils = new CustomizableUITestUtils(window);
1111

1212
add_task(async function test_setup() {
13+
SpecialPowers.pushPrefEnv({
14+
set: [["browser.search.widget.new", false]],
15+
});
1316
await gCUITestUtils.addSearchBar();
1417
registerCleanupFunction(() => {
1518
gCUITestUtils.removeSearchBar();

browser/components/extensions/test/browser/browser_unified_extensions_overflowable_toolbar.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ const OVERFLOWED_DEFAULT_WIDGET_IDS = DEFAULT_WIDGET_IDS.slice(
3131
const OVERFLOWED_EXTENSIONS_LIST_ID = "overflowed-extensions-list";
3232

3333
add_setup(async function () {
34+
await SpecialPowers.pushPrefEnv({
35+
set: [["browser.search.widget.new", false]],
36+
});
37+
3438
// To make it easier to control things that will overflow, we'll start by
3539
// removing that's removable out of the nav-bar and adding just a fixed
3640
// set of items (DEFAULT_WIDGET_IDS) at the end of the nav-bar.

browser/components/search/test/browser/browser.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ support-files = [
1515
"tooManyEnginesOffered.html",
1616
]
1717
tags = "searchnontelem"
18+
prefs = ["browser.search.widget.new=false"]
1819

1920
["browser_426329.js"]
2021
support-files = ["test.html", "discovery.html", "426329.xml"]

browser/components/search/test/browser/telemetry/browser.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[DEFAULT]
22
tags = "search-telemetry"
33
support-files = ["head.js", "head-spa.js"]
4-
prefs = ["browser.search.log=true"]
4+
prefs = ["browser.search.log=true", "browser.search.widget.new=false"]
55

66
["browser_search_glean_serp_event_telemetry_categorization_enabled_by_pref.js"]
77
support-files = ["searchTelemetryDomainCategorizationReporting.html"]

editor/libeditor/tests/browser_content_command_insert_text.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ const gCUITestUtils = new CustomizableUITestUtils(window);
1313
const gDOMWindowUtils = EventUtils._getDOMWindowUtils(window);
1414
let searchBar;
1515

16-
add_task(async function test_setup() {
16+
add_setup(async function () {
17+
await SpecialPowers.pushPrefEnv({
18+
set: [["browser.search.widget.new", false]],
19+
});
1720
searchBar = await gCUITestUtils.addSearchBar();
1821
registerCleanupFunction(() => {
1922
gCUITestUtils.removeSearchBar();

0 commit comments

Comments
 (0)