Skip to content

Commit 25cf3b2

Browse files
authored
Merge pull request #134 from mozilla/enterprise-main_merge_20251108
Enterprise main merge 20251108
2 parents b63f3e6 + 4e8b39c commit 25cf3b2

File tree

120 files changed

+1112
-739
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+1112
-739
lines changed

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,7 @@ toolkit/components/utils/mozjexl.sys.mjs
15501550
toolkit/components/viaduct/fetch_msg_types.pb.cc
15511551
toolkit/components/viaduct/fetch_msg_types.pb.h
15521552
toolkit/content/vendor/react/
1553-
toolkit/content/widgets/vendor/lit.all.mjs
1553+
toolkit/content/widgets/vendor/
15541554
toolkit/crashreporter/breakpad-client/
15551555
toolkit/crashreporter/google-breakpad/
15561556
toolkit/modules/third_party/

accessible/tests/browser/atk/browser.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ prefs = [
2323

2424
["browser_role.js"]
2525
skip-if = [
26-
"os == 'linux' && os_version == '24.04' && processor == 'x86_64' && opt && a11y_checks", # Bug 1984205
26+
"os == 'linux' && os_version == '24.04' && processor == 'x86_64' && opt", # Bug 1984205
2727
]
2828

2929
["browser_table.js"]

browser/app/profile/firefox.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,8 @@ pref("browser.search.serpMetricsRecordedCounter", 0);
879879
// days
880880
pref("browser.search.widget.removeAfterDaysUnused", 120);
881881

882+
pref("browser.search.widget.new", false);
883+
882884
// The number of times the search function in the URL bar has been used,
883885
// capped at 100.
884886
pref("browser.search.totalSearches", 0);

browser/components/backup/BackupService.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ export class BackupService extends EventTarget {
586586
*
587587
* @see BACKUP_DIR_NAME
588588
*/
589-
static #backupFolderName = null;
589+
static #backupFolderName = "Restore Firefox";
590590

591591
/**
592592
* The name of the backup archive file. Should be localized.

browser/components/profiles/SelectableProfileService.sys.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ class SelectableProfileServiceClass extends EventEmitter {
199199
"datareporting.policy.minimumPolicyVersion.channel-beta",
200200
"datareporting.usage.uploadEnabled",
201201
"termsofuse.acceptedDate",
202+
"termsofuse.firstAcceptedDate",
202203
"termsofuse.acceptedVersion",
203204
"termsofuse.bypassNotification",
204205
"termsofuse.currentVersion",

browser/components/tabbrowser/content/tabgroup-menu.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,7 @@
577577
() => {
578578
this.#handleMLOptinTelemetry("step0-optin-link-click");
579579
openTrustedLinkIn(
580-
// this is a placeholder link, it should be replaced with the actual link
581-
"https://support.mozilla.org",
580+
"https://support.mozilla.org/kb/how-use-ai-enhanced-tab-groups",
582581
"tab"
583582
);
584583
}

browser/components/tabbrowser/test/browser/tabs/browser_tab_tooltips.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ function openTooltip(node) {
1212
event => event.originalTarget.nodeName == "tooltip"
1313
);
1414
window.windowUtils.disableNonTestMouseEvents(true);
15-
EventUtils.synthesizeMouse(node, 10, 10, { type: "mouseover" });
16-
EventUtils.synthesizeMouse(node, 10, 10, { type: "mousemove" });
15+
EventUtils.synthesizeMouse(node, 2, 2, { type: "mouseover" });
16+
EventUtils.synthesizeMouse(node, 4, 4, { type: "mousemove" });
1717
EventUtils.synthesizeMouse(node, MOUSE_OFFSET, MOUSE_OFFSET, {
1818
type: "mousemove",
1919
});
20-
EventUtils.synthesizeMouse(node, 10, 10, { type: "mouseout" });
20+
EventUtils.synthesizeMouse(node, 2, 2, { type: "mouseout" });
2121
window.windowUtils.disableNonTestMouseEvents(false);
2222
return tooltipShownPromise;
2323
}

browser/components/translations/content/fullPageTranslationsPanel.inc.xhtml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
<html:h1 class="translations-panel-header-wrapper">
2222
<html:span id="full-page-translations-panel-header"></html:span>
2323
</html:h1>
24-
<hbox class="translations-panel-beta" role="image" aria-label="Beta">
25-
<image class="translations-panel-beta-icon"></image>
26-
</hbox>
2724
<toolbarbutton id="translations-panel-settings"
2825
class="panel-info-button translations-panel-settings-gear-icon"
2926
data-l10n-id="translations-panel-settings-button"

browser/components/translations/content/selectTranslationsPanel.inc.xhtml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,14 @@
1212
locationspecific="true"
1313
orient="vertical">
1414
<html:div role="document"
15-
aria-labelledby="select-translations-panel-header select-translations-panel-beta-icon-wrapper"
15+
aria-labelledby="select-translations-panel-header"
1616
aria-describedby="select-translations-panel-settings-button">
1717
<hbox id="select-translations-panel-header-row"
1818
class="panel-header select-translations-panel-content">
1919
<html:h1 class="translations-panel-header-wrapper">
2020
<html:span id="select-translations-panel-header" data-l10n-id="select-translations-panel-header">
2121
</html:span>
2222
</html:h1>
23-
<hbox id="select-translations-panel-beta-icon-wrapper"
24-
class="translations-panel-beta"
25-
role="image"
26-
aria-label="Beta">
27-
<image id="select-translations-panel-beta-icon"
28-
class="translations-panel-beta-icon">
29-
</image>
30-
</hbox>
3123
<toolbarbutton id="select-translations-panel-settings-button"
3224
class="panel-info-button translations-panel-settings-gear-icon"
3325
data-l10n-id="translations-panel-settings-button"

browser/components/translations/content/selectTranslationsPanel.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ var SelectTranslationsPanel = new (class {
255255
};
256256

257257
TranslationsPanelShared.defineLazyElements(document, this.#lazyElements, {
258-
betaIcon: "select-translations-panel-beta-icon",
259258
cancelButton: "select-translations-panel-cancel-button",
260259
copyButton: "select-translations-panel-copy-button",
261260
doneButtonPrimary: "select-translations-panel-done-button-primary",

0 commit comments

Comments
 (0)