- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 41238, 41239: Prepare Tor, Mullvad Browser 14.0a6
by morgan (＠morgan) 19 Sep '24

19 Sep '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2d28eb56 by Morgan at 2024-09-19T19:26:12+00:00 Bug 41238,41239: Prepare Tor,Mullvad Browser 14.0a6 - - - - - 6 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/firefox/config - projects/geckoview/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,16 @@ +Mullvad Browser 14.0a6 - September 19 2024 + * All Platforms + * Bug 344: set media.navigator.enabled = true [mullvad-browser] + * Bug 42718: Remove the firefox-view button from UI, even when always-on private-browsing mode is disabled [tor-browser] + * Bug 42740: Stop trying to hide "Restore previous session" [tor-browser] + * Bug 42831: Remove the shopping components [tor-browser] + * Bug 43072: moz-message-bar does not get announced on Orca screen-reader [tor-browser] + * Bug 43083: Backport fix for Mozilla 1436462 [tor-browser] + * Bug 43144: Ensure non-privacy browsing also sets the GPC header [tor-browser] + * Linux + * Bug 43141: Hardcode Arimo as a system-ui font [tor-browser] + * Bug 41237: Add some aliases to our Linux font config for compatibility [tor-browser-build] + Mullvad Browser 14.0a5 - September 12 2024 * All Platforms * Updated NoScript to 11.4.37 ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,39 @@ +Tor Browser 14.0a6 - September 19 2024 + * All Platforms + * Bug 42831: Remove the shopping components [tor-browser] + * Bug 43144: Ensure non-privacy browsing also sets the GPC header [tor-browser] + * Windows + macOS + Linux + * Bug 42698: Bridge card background contrast is low for bridge-moji [tor-browser] + * Bug 42718: Remove the firefox-view button from UI, even when always-on private-browsing mode is disabled [tor-browser] + * Bug 42740: Stop trying to hide "Restore previous session" [tor-browser] + * Bug 43072: moz-message-bar does not get announced on Orca screen-reader [tor-browser] + * Bug 43083: Backport fix for Mozilla 1436462 [tor-browser] + * Linux + * Bug 43141: Hardcode Arimo as a system-ui font [tor-browser] + * Bug 41237: Add some aliases to our Linux font config for compatibility [tor-browser-build] + * Android + * Bug 41550: Remove unused extensions from Tor Browser for Android [tor-browser] + * Bug 43052: Remove non private tabs icon and "other device tabs" from tab view [tor-browser] + * Bug 43129: about:neterror cannot display SVG on Android with Security Level Safest [tor-browser] + * Bug 43145: Backport Android security fix from 130.0.1 [tor-browser] + * Bug 43146: Update the icon of DuckDuckGo onion search engine on Android [tor-browser] + * Bug 43147: Remove unused search plugins from the apk files [tor-browser] + +Tor Browser 13.5.4 - September 16 2024 + * All Platforms + * Updated NoScript to 11.4.37 + * Updated OpenSSL to 3.0.15 + * Windows + macOS + Linux + * Bug 41835: Review default search engine options [tor-browser] + * Android + * Bug 43124: Implement a migration procedure for Android [tor-browser] + * Bug 43145: Backport Android security fix from 130.0.1 [tor-browser] + * Build System + * All Platforms + * Bug 41229: Migrate OpenSSL download location to github releases [tor-browser-build] + * macOS + * Bug 41231: Use var/browser_release_date in tools/signing/gatekeeper-bundling.sh [tor-browser-build] + Tor Browser 14.0a5 - September 12 2024 * All Platforms * Updated NoScript to 11.4.37 ===================================== projects/firefox/config ===================================== @@ -19,7 +19,7 @@ var: browser_series: '14.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 5 + browser_build: 6 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' @@ -107,7 +107,7 @@ targets: gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/' nightly_updates_publish_dir_prefix: mullvadbrowser- - browser_build: 3 + browser_build: 4 linux-x86_64: var: ===================================== projects/geckoview/config ===================================== @@ -21,7 +21,7 @@ var: browser_series: '14.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 5 + browser_build: 6 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: d69ac083437e60d681fdefce6aa1fde96e2f1eaf + git_hash: 16446c485b3be4198a7e79bfcac6510784a18506 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 39278e84f51b8440b4b9aa7c2f97d5fdb819b145 + git_hash: 92b97bec9c21cc8881bee506bd75e05bab7578a3 targets: nightly: git_hash: 'tor-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 2a9884fadf15e57f6a661f12ede1312cc71602c1 + git_hash: 0f1821e7e70c8ae3d8d59b9d889d95c135913bd9 compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,18 +73,18 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '14.0a5' + torbrowser_version: '14.0a6' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/09/12 20:39:44' + browser_release_date: '2024/09/19 19:03:33' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 14.0a5 - 14.0a4 - 14.0a3 - - 14.0a2 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-128.2.0esr-14.0-1-build6
by morgan (＠morgan) 19 Sep '24

19 Sep '24

morgan pushed new tag tor-browser-128.2.0esr-14.0-1-build6 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-128.2.0esr-14.0-1-build4
by morgan (＠morgan) 19 Sep '24

19 Sep '24

morgan pushed new tag mullvad-browser-128.2.0esr-14.0-1-build4 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] fixup! Bug 18905: Hide unwanted items from help menu
by morgan (＠morgan) 19 Sep '24

19 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: ea0d3618 by Henry Wilkes at 2024-09-19T18:48:12+00:00 fixup! Bug 18905: Hide unwanted items from help menu Bug 42740: Stop trying to hide "Restore previous session". Firefox already handles this item. If there is no previous session to restore (such as when using permanent private browsing) it is already hidden. - - - - - 1 changed file: - browser/base/content/appmenu-viewcache.inc.xhtml Changes: ===================================== browser/base/content/appmenu-viewcache.inc.xhtml ===================================== @@ -178,8 +178,7 @@ <toolbarbutton id="appMenu-restoreSession" data-l10n-id="appmenu-restore-session" class="subviewbutton" - command="Browser:RestoreLastSession" - hidden="true"/> + command="Browser:RestoreLastSession"/> <toolbarseparator/> <toolbarbutton id="appMenuClearRecentHistory" data-l10n-id="appmenu-clear-history" View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ea0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ea0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] fixup! Bug 18905: Hide unwanted items from help menu
by morgan (＠morgan) 19 Sep '24

19 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 60479f0b by Henry Wilkes at 2024-09-19T18:47:47+00:00 fixup! Bug 18905: Hide unwanted items from help menu Bug 42740: Stop trying to hide "Restore previous session". Firefox already handles this item. If there is no previous session to restore (such as when using permanent private browsing) it is already hidden. - - - - - 1 changed file: - browser/base/content/appmenu-viewcache.inc.xhtml Changes: ===================================== browser/base/content/appmenu-viewcache.inc.xhtml ===================================== @@ -177,8 +177,7 @@ <toolbarbutton id="appMenu-restoreSession" data-l10n-id="appmenu-restore-session" class="subviewbutton" - command="Browser:RestoreLastSession" - hidden="true"/> + command="Browser:RestoreLastSession"/> <toolbarseparator/> <toolbarbutton id="appMenuClearRecentHistory" data-l10n-id="appmenu-clear-history" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/60479f0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/60479f0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Bug 18905: Hide unwanted items from help menu
by morgan (＠morgan) 19 Sep '24

19 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 33111520 by Henry Wilkes at 2024-09-19T14:48:55+01:00 fixup! Bug 18905: Hide unwanted items from help menu Bug 42740: Stop trying to hide "Restore previous session". Firefox already handles this item. If there is no previous session to restore (such as when using permanent private browsing) it is already hidden. - - - - - 1 changed file: - browser/base/content/appmenu-viewcache.inc.xhtml Changes: ===================================== browser/base/content/appmenu-viewcache.inc.xhtml ===================================== @@ -182,8 +182,7 @@ <toolbarbutton id="appMenu-restoreSession" data-l10n-id="appmenu-restore-session" class="subviewbutton" - command="Browser:RestoreLastSession" - hidden="true"/> + command="Browser:RestoreLastSession"/> <toolbarseparator/> <toolbarbutton id="appMenuClearRecentHistory" data-l10n-id="appmenu-clear-history" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3311152… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3311152… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Bug 40925: Implemented the Security Level component
by ma1 (＠ma1) 19 Sep '24

19 Sep '24

ma1 pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 5f325aeb by cypherpunks1 at 2024-09-18T18:02:45-08:00 fixup! Bug 40925: Implemented the Security Level component Bug 43129: Allow Android error pages to use svg images on the Safest security level - - - - - 1 changed file: - dom/base/nsNodeInfoManager.cpp Changes: ===================================== dom/base/nsNodeInfoManager.cpp ===================================== @@ -344,6 +344,16 @@ void nsNodeInfoManager::RemoveNodeInfo(NodeInfo* aNodeInfo) { } static bool IsSystemOrAddonOrAboutPrincipal(nsIPrincipal* aPrincipal) { +#ifdef ANDROID + if (aPrincipal->SchemeIs("resource")) { + nsAutoCString spec; + aPrincipal->GetAsciiSpec(spec); + if (StringBeginsWith(spec, "resource://android/assets/"_ns)) { + return true; + } + } +#endif + return aPrincipal->IsSystemPrincipal() || BasePrincipal::Cast(aPrincipal)->AddonPolicy() || // NOTE: about:blank and about:srcdoc inherit the principal of their View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5f325ae… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5f325ae… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 5 commits: fixup! Bug 40009: [android] Change the default search engines
by morgan (＠morgan) 19 Sep '24

19 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 2ab88919 by cypherpunks1 at 2024-09-19T01:46:39+00:00 fixup! Bug 40009: [android] Change the default search engines Bug 43147: Remove unused search plugins from the apk files - - - - - 62dc73ee by cypherpunks1 at 2024-09-19T01:46:39+00:00 fixup! [android] Disable features and functionality Bug 41550: Disable and remove the search telemetry extensions - - - - - 1e47b9e6 by cypherpunks1 at 2024-09-19T01:46:39+00:00 fixup! [android] Add Tor integration and UI Bug 41550: Move webcompat changes to another commit - - - - - 9e8f177c by cypherpunks1 at 2024-09-19T01:46:39+00:00 fixup! [android] Modify UI/UX Bug 41550: Disable the webcompat and webcompat-reporter features - - - - - a5048088 by cypherpunks1 at 2024-09-19T01:46:39+00:00 fixup! [android] Disable features and functionality Bug 41550: Disable and remove the fxawebchannel extension - - - - - 7 changed files: - mobile/android/android-components/components/feature/accounts/build.gradle - mobile/android/android-components/components/feature/search/build.gradle - mobile/android/fenix/.buildconfig.yml - mobile/android/fenix/app/build.gradle - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt Changes: ===================================== mobile/android/android-components/components/feature/accounts/build.gradle ===================================== @@ -8,6 +8,10 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { + androidResources { + ignoreAssetsPattern '!<dir>extensions' + } + defaultConfig { minSdkVersion config.minSdkVersion compileSdk config.compileSdkVersion ===================================== mobile/android/android-components/components/feature/search/build.gradle ===================================== @@ -8,6 +8,10 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { + androidResources { + ignoreAssetsPattern '!<dir>extensions:!search_telemetry_v2.json:!amazon*:!azerdict*:!baidu*:!bing*:!ceneje*:!coccoc*:!daum*:!ebay*:!ecosia*:!faclair*:!google*:!gulesider*:!leo*:!mapy*:!mercadolibre*:!odpiralni*:!pazaruvaj*:!prisjakt*:!qwant*:!rakuten*:!salidzinilv*:!seznam*:!vatera*:!wikipedia-*:!wiktionary*:!yahoo*:!yandex*' + } + defaultConfig { minSdkVersion config.minSdkVersion compileSdk config.compileSdkVersion ===================================== mobile/android/fenix/.buildconfig.yml ===================================== @@ -56,8 +56,8 @@ projects: - feature-toolbar - feature-top-sites - feature-webauthn - - feature-webcompat - - feature-webcompat-reporter +# - feature-webcompat +# - feature-webcompat-reporter - feature-webnotifications - lib-crash - lib-crash-sentry ===================================== mobile/android/fenix/app/build.gradle ===================================== @@ -633,9 +633,9 @@ dependencies { implementation project(':feature-share') implementation project(':feature-accounts-push') implementation project(':feature-webauthn') - implementation project(':feature-webcompat') +// implementation project(':feature-webcompat') implementation project(':feature-webnotifications') - implementation project(':feature-webcompat-reporter') +// implementation project(':feature-webcompat-reporter') implementation project(':service-pocket') implementation project(':service-contile') ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt ===================================== @@ -67,8 +67,8 @@ import mozilla.components.concept.base.crash.Breadcrumb import mozilla.components.concept.engine.permission.SitePermissions import mozilla.components.concept.engine.prompt.ShareData import mozilla.components.concept.storage.LoginEntry -import mozilla.components.feature.accounts.FxaCapability -import mozilla.components.feature.accounts.FxaWebChannelFeature +// import mozilla.components.feature.accounts.FxaCapability +// import mozilla.components.feature.accounts.FxaWebChannelFeature import mozilla.components.feature.app.links.AppLinksFeature import mozilla.components.feature.contextmenu.ContextMenuCandidate import mozilla.components.feature.contextmenu.ContextMenuFeature @@ -254,7 +254,7 @@ abstract class BaseBrowserFragment : private val sitePermissionsFeature = ViewBoundFeatureWrapper<SitePermissionsFeature>() private val fullScreenFeature = ViewBoundFeatureWrapper<FullScreenFeature>() private val swipeRefreshFeature = ViewBoundFeatureWrapper<SwipeRefreshFeature>() - private val webchannelIntegration = ViewBoundFeatureWrapper<FxaWebChannelFeature>() +// private val webchannelIntegration = ViewBoundFeatureWrapper<FxaWebChannelFeature>() private val sitePermissionWifiIntegration = ViewBoundFeatureWrapper<SitePermissionsWifiIntegration>() private val secureWindowFeature = ViewBoundFeatureWrapper<SecureWindowFeature>() @@ -1022,6 +1022,7 @@ abstract class BaseBrowserFragment : ) } +/* webchannelIntegration.set( feature = FxaWebChannelFeature( customTabSessionId, @@ -1034,6 +1035,7 @@ abstract class BaseBrowserFragment : owner = this, view = view, ) +*/ initializeEngineView( topToolbarHeight = context.settings().getTopToolbarHeight( ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt ===================================== @@ -58,21 +58,21 @@ import mozilla.components.feature.readerview.ReaderViewMiddleware import mozilla.components.feature.recentlyclosed.RecentlyClosedMiddleware import mozilla.components.feature.recentlyclosed.RecentlyClosedTabsStorage import mozilla.components.feature.search.ext.createApplicationSearchEngine -import mozilla.components.feature.search.middleware.AdsTelemetryMiddleware +// import mozilla.components.feature.search.middleware.AdsTelemetryMiddleware import mozilla.components.feature.search.middleware.SearchExtraParams import mozilla.components.feature.search.middleware.SearchMiddleware import mozilla.components.feature.search.region.RegionMiddleware -import mozilla.components.feature.search.telemetry.SerpTelemetryRepository -import mozilla.components.feature.search.telemetry.ads.AdsTelemetry -import mozilla.components.feature.search.telemetry.incontent.InContentTelemetry +// import mozilla.components.feature.search.telemetry.SerpTelemetryRepository +// import mozilla.components.feature.search.telemetry.ads.AdsTelemetry +// import mozilla.components.feature.search.telemetry.incontent.InContentTelemetry import mozilla.components.feature.session.HistoryDelegate import mozilla.components.feature.session.middleware.LastAccessMiddleware import mozilla.components.feature.session.middleware.undo.UndoMiddleware import mozilla.components.feature.sitepermissions.OnDiskSitePermissionsStorage import mozilla.components.feature.top.sites.DefaultTopSitesStorage import mozilla.components.feature.top.sites.PinnedSiteStorage -import mozilla.components.feature.webcompat.WebCompatFeature -import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature +// import mozilla.components.feature.webcompat.WebCompatFeature +// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature import mozilla.components.feature.webnotifications.WebNotificationFeature import mozilla.components.lib.dataprotect.SecureAbove22Preferences import mozilla.components.service.contile.ContileTopSitesProvider @@ -166,6 +166,7 @@ class Core( defaultSettings, geckoRuntime, ).also { +// WebCompatFeature.install(it) /** * There are some issues around localization to be resolved, as well as questions around @@ -173,10 +174,9 @@ class Core( * disabled in Fenix Release builds for now. * This is consistent with both Fennec and Firefox Desktop. */ - if (false && (Config.channel.isNightlyOrDebug || Config.channel.isBeta)) { - WebCompatFeature.install(it) - WebCompatReporterFeature.install(it, "fenix") - } +// if (Config.channel.isNightlyOrDebug || Config.channel.isBeta) { +// WebCompatReporterFeature.install(it, "fenix") +// } TorBrowserFeatures.install(context, it) } @@ -296,7 +296,7 @@ class Core( ), RecordingDevicesMiddleware(context, context.components.notificationsDelegate), PromptMiddleware(), - AdsTelemetryMiddleware(adsTelemetry), +// AdsTelemetryMiddleware(adsTelemetry), LastMediaAccessMiddleware(), HistoryMetadataMiddleware(historyMetadataService), SessionPrioritizationMiddleware(), @@ -326,6 +326,7 @@ class Core( // Install the "icons" WebExtension to automatically load icons for every visited website. icons.install(engine, this) +/* CoroutineScope(Dispatchers.Main).launch { val readJson = { context.assets.readJSONObject("search/search_telemetry_v2.json") } val providerList = withContext(Dispatchers.IO) { @@ -345,6 +346,7 @@ class Core( // Install the "cookies" WebExtension and tracks user interaction with SERPs. searchTelemetry.install(engine, this@apply, providerList) } +*/ WebNotificationFeature( context, @@ -390,13 +392,13 @@ class Core( context.components.analytics.metrics } - val adsTelemetry by lazyMonitored { - AdsTelemetry() - } +// val adsTelemetry by lazyMonitored { +// AdsTelemetry() +// } - val searchTelemetry by lazyMonitored { - InContentTelemetry() - } +// val searchTelemetry by lazyMonitored { +// InContentTelemetry() +// } /** * Shortcut component for managing shortcuts on the device home screen. ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt ===================================== @@ -31,6 +31,7 @@ import mozilla.components.browser.state.state.TabSessionState import mozilla.components.browser.state.store.BrowserStore import mozilla.components.concept.storage.BookmarksStorage import mozilla.components.feature.top.sites.PinnedSiteStorage +// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature import mozilla.components.lib.state.ext.flowScoped import mozilla.components.support.ktx.android.content.getColorFromAttr import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a3e970… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a3e970… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] Bug 42831: Remove the shopping components.
by morgan (＠morgan) 18 Sep '24

18 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: ee9a53d8 by Henry Wilkes at 2024-09-18T20:12:06+00:00 Bug 42831: Remove the shopping components. - - - - - 12 changed files: - browser/base/content/browser-init.js - browser/base/content/browser.js - browser/base/content/browser.js.globals - browser/base/content/browser.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/shopping/jar.mn - browser/components/shopping/moz.build - toolkit/components/shopping/jar.mn - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== browser/base/content/browser-init.js ===================================== @@ -613,8 +613,6 @@ var gBrowserInit = { CaptivePortalWatcher.delayedStartup(); - ShoppingSidebarManager.ensureInitialized(); - SessionStore.promiseAllWindowsRestored.then(() => { this._schedulePerWindowIdleTasks(); document.documentElement.setAttribute("sessionrestored", "true"); ===================================== browser/base/content/browser.js ===================================== @@ -39,7 +39,7 @@ ChromeUtils.defineESModuleGetters(this, { E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", ExtensionsUI: "resource:///modules/ExtensionsUI.sys.mjs", HomePage: "resource:///modules/HomePage.sys.mjs", - isProductURL: "chrome://global/content/shopping/ShoppingProduct.mjs", + // Removed isProductURL from ShoppingProduct.mjs. tor-browser#42831. LightweightThemeConsumer: "resource://gre/modules/LightweightThemeConsumer.sys.mjs", LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs", @@ -71,8 +71,8 @@ ChromeUtils.defineESModuleGetters(this, { SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", - ShoppingSidebarParent: "resource:///actors/ShoppingSidebarParent.sys.mjs", - ShoppingSidebarManager: "resource:///actors/ShoppingSidebarParent.sys.mjs", + // Removed ShoppingSidebarParent and ShoppingSidebarManager. + // tor-browser#42831. ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", SiteDataManager: "resource:///modules/SiteDataManager.sys.mjs", SitePermissions: "resource:///modules/SitePermissions.sys.mjs", @@ -4340,10 +4340,6 @@ var TabsProgressListener = { return; } - // Some shops use pushState to move between individual products, so - // the shopping code needs to be told about all of these. - ShoppingSidebarManager.onLocationChange(aBrowser, aLocationURI, aFlags); - // Filter out location changes caused by anchor navigation // or history.push/pop/replaceState. if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) { ===================================== browser/base/content/browser.js.globals ===================================== @@ -130,7 +130,6 @@ "E10SUtils", "ExtensionsUI", "HomePage", - "isProductURL", "LightweightThemeConsumer", "LoginHelper", "LoginManagerParent", @@ -161,8 +160,6 @@ "SearchUIUtils", "SessionStartup", "SessionStore", - "ShoppingSidebarParent", - "ShoppingSidebarManager", "ShortcutUtils", "SiteDataManager", "SitePermissions", ===================================== browser/base/content/browser.xhtml ===================================== @@ -127,7 +127,7 @@ Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this); + // Removed shopping-sidebar.js. tor-browser#42831. Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -380,6 +380,8 @@ <image class="urlbar-icon" id="translations-button-circle-arrows" /> <html:span id="translations-button-locale" aria-hidden="true" /> </hbox> +  <hbox id="shopping-sidebar-button" class="urlbar-page-action" role="button" ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -86,7 +86,7 @@ ChromeUtils.defineESModuleGetters(lazy, { SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShellService: "resource:///modules/ShellService.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", - ShoppingUtils: "resource:///modules/ShoppingUtils.sys.mjs", + // Removed ShoppingUtils. tor-browser#42831. SpecialMessageActions: "resource://messaging-system/lib/SpecialMessageActions.sys.mjs", TRRRacer: "resource:///modules/TRRPerformance.sys.mjs", @@ -481,19 +481,7 @@ let JSWINDOWACTORS = { matches: ["about:tabcrashed*"], }, - AboutWelcomeShopping: { - parent: { - esModuleURI: "resource:///actors/AboutWelcomeParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/AboutWelcomeChild.sys.mjs", - events: { - Update: {}, - }, - }, - matches: ["about:shoppingsidebar"], - remoteTypes: ["privilegedabout"], - }, + // Removed AboutWelcomeShopping. tor-browser#42831. AboutWelcome: { parent: { @@ -890,27 +878,7 @@ let JSWINDOWACTORS = { matches: ["about:studies*"], }, - ShoppingSidebar: { - parent: { - esModuleURI: "resource:///actors/ShoppingSidebarParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/ShoppingSidebarChild.sys.mjs", - events: { - ContentReady: { wantUntrusted: true }, - PolledRequestMade: { wantUntrusted: true }, - // This is added so the actor instantiates immediately and makes - // methods available to the page js on load. - DOMDocElementInserted: {}, - ReportProductAvailable: { wantUntrusted: true }, - AdClicked: { wantUntrusted: true }, - AdImpression: { wantUntrusted: true }, - DisableShopping: { wantUntrusted: true }, - }, - }, - matches: ["about:shoppingsidebar"], - remoteTypes: ["privilegedabout"], - }, + // Removed ShoppingSidebar. tor-browser#42831. SpeechDispatcher: { parent: { @@ -2276,7 +2244,6 @@ BrowserGlue.prototype = { } }, () => lazy.RFPHelper.uninit(), - () => lazy.ShoppingUtils.uninit(), () => { if (AppConstants.MOZ_UPDATER) { lazy.UpdateListener.reset(); @@ -3234,13 +3201,6 @@ BrowserGlue.prototype = { }, }, - { - name: "ShoppingUtils.init", - task: () => { - lazy.ShoppingUtils.init(); - }, - }, - { // Starts the JSOracle process for ORB JavaScript validation, if it hasn't started already. name: "start-orb-javascript-oracle", ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -96,12 +96,7 @@ static const RedirEntry kRedirMap[] = { {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"shoppingsidebar", "chrome://browser/content/shopping/shopping.html", - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | - nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | - nsIAboutModule::IS_SECURE_CHROME_UI}, + // Removed about:shoppingsidebar. tor-browser#42831. {"tabcrashed", "chrome://browser/content/aboutTabCrashed.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, ===================================== browser/components/about/components.conf ===================================== @@ -24,7 +24,7 @@ pages = [ 'rights', 'sessionrestore', 'settings', - 'shoppingsidebar', + # Removed 'shoppingsidebar'. tor-browser#42831. 'tabcrashed', 'unloads', 'welcome', ===================================== browser/components/shopping/jar.mn ===================================== @@ -2,30 +2,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -browser.jar: - content/browser/shopping/onboarding.mjs (content/onboarding.mjs) - content/browser/shopping/shopping.html (content/shopping.html) - content/browser/shopping/shopping-container.css (content/shopping-container.css) - content/browser/shopping/shopping-page.css (content/shopping-page.css) - content/browser/shopping/shopping-sidebar.js (content/shopping-sidebar.js) - content/browser/shopping/shopping-message-bar.css (content/shopping-message-bar.css) - content/browser/shopping/shopping-message-bar.mjs (content/shopping-message-bar.mjs) - content/browser/shopping/highlights.mjs (content/highlights.mjs) - content/browser/shopping/highlight-item.css (content/highlight-item.css) - content/browser/shopping/highlight-item.mjs (content/highlight-item.mjs) - content/browser/shopping/shopping-card.css (content/shopping-card.css) - content/browser/shopping/shopping-card.mjs (content/shopping-card.mjs) - content/browser/shopping/letter-grade.css (content/letter-grade.css) - content/browser/shopping/letter-grade.mjs (content/letter-grade.mjs) - content/browser/shopping/settings.mjs (content/settings.mjs) - content/browser/shopping/settings.css (content/settings.css) - content/browser/shopping/shopping-container.mjs (content/shopping-container.mjs) - content/browser/shopping/adjusted-rating.mjs (content/adjusted-rating.mjs) - content/browser/shopping/reliability.mjs (content/reliability.mjs) - content/browser/shopping/analysis-explainer.css (content/analysis-explainer.css) - content/browser/shopping/analysis-explainer.mjs (content/analysis-explainer.mjs) - content/browser/shopping/unanalyzed.css (content/unanalyzed.css) - content/browser/shopping/unanalyzed.mjs (content/unanalyzed.mjs) - content/browser/shopping/recommended-ad.css (content/recommended-ad.css) - content/browser/shopping/recommended-ad.mjs (content/recommended-ad.mjs) - content/browser/shopping/assets/ (content/assets/*) +# Removed desktop shopping-sidebar content. tor-browser#42831. ===================================== browser/components/shopping/moz.build ===================================== @@ -6,14 +6,8 @@ JAR_MANIFESTS += ["jar.mn"] -FINAL_TARGET_FILES.actors += [ - "ShoppingSidebarChild.sys.mjs", - "ShoppingSidebarParent.sys.mjs", -] - -EXTRA_JS_MODULES += [ - "ShoppingUtils.sys.mjs", -] +# Removed ShoppingSidebarParent, ShoppingSidebarChild and ShoppingUtils. +# tor-browser#42831. BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"] ===================================== toolkit/components/shopping/jar.mn ===================================== @@ -2,19 +2,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -toolkit.jar: - content/global/shopping/ProductConfig.mjs (content/ProductConfig.mjs) - content/global/shopping/ProductValidator.sys.mjs (content/ProductValidator.sys.mjs) - content/global/shopping/ShoppingProduct.mjs (content/ShoppingProduct.mjs) - content/global/shopping/analysis_response.schema.json (schemas/analysis_response.schema.json) - content/global/shopping/recommendations_response.schema.json (schemas/recommendations_response.schema.json) - content/global/shopping/analysis_request.schema.json (schemas/analysis_request.schema.json) - content/global/shopping/recommendations_request.schema.json (schemas/recommendations_request.schema.json) - content/global/shopping/attribution_response.schema.json (schemas/attribution_response.schema.json) - content/global/shopping/attribution_request.schema.json (schemas/attribution_request.schema.json) - content/global/shopping/reporting_response.schema.json (schemas/reporting_response.schema.json) - content/global/shopping/reporting_request.schema.json (schemas/reporting_request.schema.json) - content/global/shopping/analysis_status_request.schema.json (schemas/analysis_status_request.schema.json) - content/global/shopping/analysis_status_response.schema.json (schemas/analysis_status_response.schema.json) - content/global/shopping/analyze_request.schema.json (schemas/analyze_request.schema.json) - content/global/shopping/analyze_response.schema.json (schemas/analyze_response.schema.json) +# Removed ShoppingProduct modules and schema JSONs. tor-browser#42831. ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -216,21 +216,7 @@ export let RemotePageAccessManager = { ], RPMRecordTelemetryEvent: ["*"], }, - "about:shoppingsidebar": { - RPMSetPref: [ - "browser.shopping.experience2023.optedIn", - "browser.shopping.experience2023.active", - "browser.shopping.experience2023.ads.userEnabled", - "browser.shopping.experience2023.sidebarClosedCount", - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - "browser.shopping.experience2023.autoOpen.userEnabled", - ], - RPMGetFormatURLPref: ["app.support.baseURL"], - RPMGetIntPref: ["browser.shopping.experience2023.sidebarClosedCount"], - RPMGetBoolPref: [ - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - ], - }, + // Removed about:shoppingsidebar. tor-browser#42831. "about:tabcrashed": { RPMSendAsyncMessage: ["Load", "closeTab", "restoreTab", "restoreAll"], RPMAddMessageListener: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ee9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ee9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] Bug 42831: Remove the shopping components.
by morgan (＠morgan) 18 Sep '24

18 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: a02c5383 by Henry Wilkes at 2024-09-18T20:10:20+00:00 Bug 42831: Remove the shopping components. - - - - - 12 changed files: - browser/base/content/browser-init.js - browser/base/content/browser.js - browser/base/content/browser.js.globals - browser/base/content/browser.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/shopping/jar.mn - browser/components/shopping/moz.build - toolkit/components/shopping/jar.mn - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== browser/base/content/browser-init.js ===================================== @@ -613,8 +613,6 @@ var gBrowserInit = { CaptivePortalWatcher.delayedStartup(); - ShoppingSidebarManager.ensureInitialized(); - SessionStore.promiseAllWindowsRestored.then(() => { this._schedulePerWindowIdleTasks(); document.documentElement.setAttribute("sessionrestored", "true"); ===================================== browser/base/content/browser.js ===================================== @@ -39,7 +39,7 @@ ChromeUtils.defineESModuleGetters(this, { E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", ExtensionsUI: "resource:///modules/ExtensionsUI.sys.mjs", HomePage: "resource:///modules/HomePage.sys.mjs", - isProductURL: "chrome://global/content/shopping/ShoppingProduct.mjs", + // Removed isProductURL from ShoppingProduct.mjs. tor-browser#42831. LightweightThemeConsumer: "resource://gre/modules/LightweightThemeConsumer.sys.mjs", LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs", @@ -71,8 +71,8 @@ ChromeUtils.defineESModuleGetters(this, { SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", - ShoppingSidebarParent: "resource:///actors/ShoppingSidebarParent.sys.mjs", - ShoppingSidebarManager: "resource:///actors/ShoppingSidebarParent.sys.mjs", + // Removed ShoppingSidebarParent and ShoppingSidebarManager. + // tor-browser#42831. ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", SiteDataManager: "resource:///modules/SiteDataManager.sys.mjs", SitePermissions: "resource:///modules/SitePermissions.sys.mjs", @@ -4338,10 +4338,6 @@ var TabsProgressListener = { return; } - // Some shops use pushState to move between individual products, so - // the shopping code needs to be told about all of these. - ShoppingSidebarManager.onLocationChange(aBrowser, aLocationURI, aFlags); - // Filter out location changes caused by anchor navigation // or history.push/pop/replaceState. if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) { ===================================== browser/base/content/browser.js.globals ===================================== @@ -130,7 +130,6 @@ "E10SUtils", "ExtensionsUI", "HomePage", - "isProductURL", "LightweightThemeConsumer", "LoginHelper", "LoginManagerParent", @@ -161,8 +160,6 @@ "SearchUIUtils", "SessionStartup", "SessionStore", - "ShoppingSidebarParent", - "ShoppingSidebarManager", "ShortcutUtils", "SiteDataManager", "SitePermissions", ===================================== browser/base/content/browser.xhtml ===================================== @@ -127,7 +127,7 @@ Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this); + // Removed shopping-sidebar.js. tor-browser#42831. Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -380,6 +380,8 @@ <image class="urlbar-icon" id="translations-button-circle-arrows" /> <html:span id="translations-button-locale" aria-hidden="true" /> </hbox> +  <hbox id="shopping-sidebar-button" class="urlbar-page-action" role="button" ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -86,7 +86,7 @@ ChromeUtils.defineESModuleGetters(lazy, { SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShellService: "resource:///modules/ShellService.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", - ShoppingUtils: "resource:///modules/ShoppingUtils.sys.mjs", + // Removed ShoppingUtils. tor-browser#42831. SpecialMessageActions: "resource://messaging-system/lib/SpecialMessageActions.sys.mjs", TRRRacer: "resource:///modules/TRRPerformance.sys.mjs", @@ -500,19 +500,7 @@ let JSWINDOWACTORS = { matches: ["about:tabcrashed*"], }, - AboutWelcomeShopping: { - parent: { - esModuleURI: "resource:///actors/AboutWelcomeParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/AboutWelcomeChild.sys.mjs", - events: { - Update: {}, - }, - }, - matches: ["about:shoppingsidebar"], - remoteTypes: ["privilegedabout"], - }, + // Removed AboutWelcomeShopping. tor-browser#42831. AboutWelcome: { parent: { @@ -909,27 +897,7 @@ let JSWINDOWACTORS = { matches: ["about:studies*"], }, - ShoppingSidebar: { - parent: { - esModuleURI: "resource:///actors/ShoppingSidebarParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/ShoppingSidebarChild.sys.mjs", - events: { - ContentReady: { wantUntrusted: true }, - PolledRequestMade: { wantUntrusted: true }, - // This is added so the actor instantiates immediately and makes - // methods available to the page js on load. - DOMDocElementInserted: {}, - ReportProductAvailable: { wantUntrusted: true }, - AdClicked: { wantUntrusted: true }, - AdImpression: { wantUntrusted: true }, - DisableShopping: { wantUntrusted: true }, - }, - }, - matches: ["about:shoppingsidebar"], - remoteTypes: ["privilegedabout"], - }, + // Removed ShoppingSidebar. tor-browser#42831. SpeechDispatcher: { parent: { @@ -2295,7 +2263,6 @@ BrowserGlue.prototype = { } }, () => lazy.RFPHelper.uninit(), - () => lazy.ShoppingUtils.uninit(), () => { if (AppConstants.MOZ_UPDATER) { lazy.UpdateListener.reset(); @@ -3253,13 +3220,6 @@ BrowserGlue.prototype = { }, }, - { - name: "ShoppingUtils.init", - task: () => { - lazy.ShoppingUtils.init(); - }, - }, - { // Starts the JSOracle process for ORB JavaScript validation, if it hasn't started already. name: "start-orb-javascript-oracle", ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -92,12 +92,7 @@ static const RedirEntry kRedirMap[] = { {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"shoppingsidebar", "chrome://browser/content/shopping/shopping.html", - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | - nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | - nsIAboutModule::IS_SECURE_CHROME_UI}, + // Removed about:shoppingsidebar. tor-browser#42831. {"tabcrashed", "chrome://browser/content/aboutTabCrashed.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, ===================================== browser/components/about/components.conf ===================================== @@ -26,7 +26,7 @@ pages = [ 'robots', 'sessionrestore', 'settings', - 'shoppingsidebar', + # Removed 'shoppingsidebar'. tor-browser#42831. 'tabcrashed', 'unloads', 'welcome', ===================================== browser/components/shopping/jar.mn ===================================== @@ -2,30 +2,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -browser.jar: - content/browser/shopping/onboarding.mjs (content/onboarding.mjs) - content/browser/shopping/shopping.html (content/shopping.html) - content/browser/shopping/shopping-container.css (content/shopping-container.css) - content/browser/shopping/shopping-page.css (content/shopping-page.css) - content/browser/shopping/shopping-sidebar.js (content/shopping-sidebar.js) - content/browser/shopping/shopping-message-bar.css (content/shopping-message-bar.css) - content/browser/shopping/shopping-message-bar.mjs (content/shopping-message-bar.mjs) - content/browser/shopping/highlights.mjs (content/highlights.mjs) - content/browser/shopping/highlight-item.css (content/highlight-item.css) - content/browser/shopping/highlight-item.mjs (content/highlight-item.mjs) - content/browser/shopping/shopping-card.css (content/shopping-card.css) - content/browser/shopping/shopping-card.mjs (content/shopping-card.mjs) - content/browser/shopping/letter-grade.css (content/letter-grade.css) - content/browser/shopping/letter-grade.mjs (content/letter-grade.mjs) - content/browser/shopping/settings.mjs (content/settings.mjs) - content/browser/shopping/settings.css (content/settings.css) - content/browser/shopping/shopping-container.mjs (content/shopping-container.mjs) - content/browser/shopping/adjusted-rating.mjs (content/adjusted-rating.mjs) - content/browser/shopping/reliability.mjs (content/reliability.mjs) - content/browser/shopping/analysis-explainer.css (content/analysis-explainer.css) - content/browser/shopping/analysis-explainer.mjs (content/analysis-explainer.mjs) - content/browser/shopping/unanalyzed.css (content/unanalyzed.css) - content/browser/shopping/unanalyzed.mjs (content/unanalyzed.mjs) - content/browser/shopping/recommended-ad.css (content/recommended-ad.css) - content/browser/shopping/recommended-ad.mjs (content/recommended-ad.mjs) - content/browser/shopping/assets/ (content/assets/*) +# Removed desktop shopping-sidebar content. tor-browser#42831. ===================================== browser/components/shopping/moz.build ===================================== @@ -6,14 +6,8 @@ JAR_MANIFESTS += ["jar.mn"] -FINAL_TARGET_FILES.actors += [ - "ShoppingSidebarChild.sys.mjs", - "ShoppingSidebarParent.sys.mjs", -] - -EXTRA_JS_MODULES += [ - "ShoppingUtils.sys.mjs", -] +# Removed ShoppingSidebarParent, ShoppingSidebarChild and ShoppingUtils. +# tor-browser#42831. BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"] ===================================== toolkit/components/shopping/jar.mn ===================================== @@ -2,19 +2,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -toolkit.jar: - content/global/shopping/ProductConfig.mjs (content/ProductConfig.mjs) - content/global/shopping/ProductValidator.sys.mjs (content/ProductValidator.sys.mjs) - content/global/shopping/ShoppingProduct.mjs (content/ShoppingProduct.mjs) - content/global/shopping/analysis_response.schema.json (schemas/analysis_response.schema.json) - content/global/shopping/recommendations_response.schema.json (schemas/recommendations_response.schema.json) - content/global/shopping/analysis_request.schema.json (schemas/analysis_request.schema.json) - content/global/shopping/recommendations_request.schema.json (schemas/recommendations_request.schema.json) - content/global/shopping/attribution_response.schema.json (schemas/attribution_response.schema.json) - content/global/shopping/attribution_request.schema.json (schemas/attribution_request.schema.json) - content/global/shopping/reporting_response.schema.json (schemas/reporting_response.schema.json) - content/global/shopping/reporting_request.schema.json (schemas/reporting_request.schema.json) - content/global/shopping/analysis_status_request.schema.json (schemas/analysis_status_request.schema.json) - content/global/shopping/analysis_status_response.schema.json (schemas/analysis_status_response.schema.json) - content/global/shopping/analyze_request.schema.json (schemas/analyze_request.schema.json) - content/global/shopping/analyze_response.schema.json (schemas/analyze_response.schema.json) +# Removed ShoppingProduct modules and schema JSONs. tor-browser#42831. ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -216,21 +216,7 @@ export let RemotePageAccessManager = { ], RPMRecordTelemetryEvent: ["*"], }, - "about:shoppingsidebar": { - RPMSetPref: [ - "browser.shopping.experience2023.optedIn", - "browser.shopping.experience2023.active", - "browser.shopping.experience2023.ads.userEnabled", - "browser.shopping.experience2023.sidebarClosedCount", - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - "browser.shopping.experience2023.autoOpen.userEnabled", - ], - RPMGetFormatURLPref: ["app.support.baseURL"], - RPMGetIntPref: ["browser.shopping.experience2023.sidebarClosedCount"], - RPMGetBoolPref: [ - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - ], - }, + // Removed about:shoppingsidebar. tor-browser#42831. "about:tabcrashed": { RPMSendAsyncMessage: ["Load", "closeTab", "restoreTab", "restoreAll"], RPMAddMessageListener: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a02c538… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a02c538… You're receiving this email because of your account on gitlab.torproject.org.

1 0