0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-21 21:23:08 -05:00

try to fix firefox-view.patch

This commit is contained in:
fxbrit 2022-11-22 23:04:36 +01:00
parent 4042afc31c
commit 5c709ba1d4
2 changed files with 1 additions and 106 deletions

View file

@ -13,6 +13,7 @@ patches/sed-patches/allow-searchengines-non-esr.patch
patches/sed-patches/disable-pocket.patch
patches/sed-patches/remove-internal-plugin-certs.patch
patches/sed-patches/stop-undesired-requests.patch
patches/ui-patches/firefox-view.patch
patches/ui-patches/handlers.patch
patches/ui-patches/hide-default-browser.patch
patches/ui-patches/lw-logo-devtools.patch

View file

@ -1,34 +1,3 @@
diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
index 30c9145..5e0eda8 100644
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -274,7 +274,6 @@ var CustomizableUIInternal = {
{
type: CustomizableUI.TYPE_TOOLBAR,
defaultPlacements: [
- "firefox-view-button",
"tabbrowser-tabs",
"new-tab-button",
"alltabs-button",
@@ -602,18 +601,6 @@ var CustomizableUIInternal = {
navbarPlacements.splice(newPosition, 0, "save-to-pocket-button");
}
}
-
- // Add firefox-view if not present
- if (currentVersion < 18) {
- let tabstripPlacements =
- gSavedState.placements[CustomizableUI.AREA_TABSTRIP];
- if (
- tabstripPlacements &&
- !tabstripPlacements.includes("firefox-view-button")
- ) {
- tabstripPlacements.unshift("firefox-view-button");
- }
- }
},
_updateForNewProtonVersion() {
diff --git a/browser/components/firefoxview/firefoxview.html b/browser/components/firefoxview/firefoxview.html
index 2fe5208..057481b 100644
--- a/browser/components/firefoxview/firefoxview.html
@ -82,78 +51,3 @@ index 520c092..c0b2669 100644
Services.telemetry.setEventRecordingEnabled("firefoxview", true);
Services.telemetry.recordEvent("firefoxview", "entered", "firefoxview", null);
document.getElementById("recently-closed-tabs-container").onLoad();
diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
index 616839d..f849f60 100644
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -78,56 +78,6 @@ const BASE_MESSAGES = () => [
},
trigger: { id: "protectionsPanelOpen" },
},
- {
- id: "CFR_FIREFOX_VIEW",
- groups: ["cfr"],
- template: "cfr_doorhanger",
- content: {
- bucket_id: "CFR_FIREFOX_VIEW",
- anchor_id: "firefox-view-button",
- layout: "icon_and_message",
- icon: "chrome://browser/content/cfr-lightning.svg",
- icon_dark_theme: "chrome://browser/content/cfr-lightning-dark.svg",
- icon_class: "cfr-doorhanger-small-icon",
- heading_text: {
- string_id: "firefoxview-cfr-header",
- },
- text: {
- string_id: "firefoxview-cfr-body",
- },
- buttons: {
- primary: {
- label: {
- string_id: "firefoxview-cfr-primarybutton",
- },
- action: {
- type: "OPEN_FIREFOX_VIEW",
- navigate: true,
- },
- },
- secondary: [
- {
- label: {
- string_id: "firefoxview-cfr-secondarybutton",
- },
- action: {
- type: "CANCEL",
- },
- },
- ],
- },
- skip_address_bar_notifier: true,
- },
- frequency: {
- lifetime: 1,
- },
- trigger: {
- id: "nthTabClosed",
- },
- // Avoid breaking existing tests that close tabs for now.
- targeting:
- "!inMr2022Holdback && (currentDate|date - profileAgeCreated) / 86400000 >= 2 && tabsClosedCount >= 3 && 'browser.firefox-view.view-count'|preferenceValue == 0 && !'browser.newtabpage.activity-stream.asrouter.providers.cfr'|preferenceIsUserSet",
- },
{
id: "FX_MR_106_UPGRADE",
template: "spotlight",
diff --git a/toolkit/components/nimbus/FeatureManifest.yaml b/toolkit/components/nimbus/FeatureManifest.yaml
--- a/toolkit/components/nimbus/FeatureManifest.yaml
+++ b/toolkit/components/nimbus/FeatureManifest.yaml
@@ -638,10 +638,6 @@ majorRelease2022:
type: boolean
fallbackPref: "browser.theme.colorway-closet"
description: "Whether or not to show the colorway closet modal"
- firefoxView:
- type: boolean
- fallbackPref: "browser.tabs.firefox-view"
- description: "Whether or not to show the firefox view tab"
onboarding:
type: boolean
fallbackPref: "browser.majorrelease.onboarding"