Backed out 3 changesets (bug 1852340) for causing failures due to reportBrokenSite.ftl. CLOSED TREE

Backed out changeset 86f9e01f70d6 (bug 1852340)
Backed out changeset 0049d0494b17 (bug 1852340)
Backed out changeset 7851355d5c95 (bug 1852340)

Author: ncsoregi

browser/app/profile/firefox.js

@@ -2900,21 +2900,6 @@ pref("cookiebanners.ui.desktop.cfrVariant", 0);
   pref("dom.security.credentialmanagement.identity.enabled", true);
 #endif
 
-#if defined(NIGHTLY_BUILD)
-pref("ui.new-webcompat-reporter.enabled", true);
-#else
-pref("ui.new-webcompat-reporter.enabled", false);
-#endif
-
-#if defined(EARLY_BETA_OR_EARLIER)
-pref("ui.new-webcompat-reporter.send-more-info-link", true);
-#else
-pref("ui.new-webcompat-reporter.send-more-info-link", false);
-#endif
-
-# 0 = disabled, 1 = reason optional, 2 = reason required.
-pref("ui.new-webcompat-reporter.reason-dropdown", 0);
-
 // Reset Private Browsing Session feature
 #if defined(NIGHTLY_BUILD)
   pref("browser.privatebrowsing.resetPBM.enabled", true);

browser/base/content/appmenu-viewcache.inc.xhtml

@@ -146,11 +146,6 @@
                      data-l10n-id="appmenuitem-more-tools"
                      closemenu="none"
                      oncommand="PanelUI.showMoreToolsPanel(this);"/>
-      <toolbarbutton id="appMenu-report-broken-site-button"
-                     class="subviewbutton subviewbutton-nav"
-                     data-l10n-id="appmenuitem-report-broken-site"
-                     closemenu="none"
-                     command="cmd_reportBrokenSite"/>
       <toolbarbutton id="appMenu-help-button2"
                      class="subviewbutton subviewbutton-nav"
                      data-l10n-id="appmenuitem-help"

browser/base/content/browser-menubar.inc

@@ -472,10 +472,6 @@
 #else
                           />
 #endif
-                <menuitem id="help_reportBrokenSite"
-                          command="cmd_reportBrokenSite"
-                          data-l10n-id="menu-report-broken-site"
-                          appmenu-data-l10n-id="menu-report-broken-site"/>
                 <menuitem id="feedbackPage"
                           oncommand="openFeedbackPage()"
                           data-l10n-id="menu-help-share-ideas"

browser/base/content/browser-sets.inc

@@ -51,7 +51,6 @@
 #ifdef XP_MACOSX
     <command id="cmd_findSelection" oncommand="gLazyFindCommand('onFindSelectionCommand')"/>
 #endif
-    <command id="cmd_reportBrokenSite" oncommand="ReportBrokenSite.open(event);"/>
     <command id="cmd_translate" oncommand="TranslationsPanel.open(event);"/>
     <!-- work-around bug 392512 -->
     <command id="Browser:AddBookmarkAs"

browser/base/content/browser.js

@@ -65,7 +65,6 @@ ChromeUtils.defineESModuleGetters(this, {
   PromptUtils: "resource://gre/modules/PromptUtils.sys.mjs",
   ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
   ResetPBMPanel: "resource:///modules/ResetPBMPanel.sys.mjs",
-  ReportBrokenSite: "resource:///modules/ReportBrokenSite.sys.mjs",
   SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs",
   Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
   SaveToPocket: "chrome://pocket/content/SaveToPocket.sys.mjs",
@@ -1880,7 +1879,6 @@ var gBrowserInit = {
     // apply full zoom settings to tabs restored by the session restore service.
     FullZoom.init();
     PanelUI.init(shouldSuppressPopupNotifications);
-    ReportBrokenSite.init(gBrowser);
 
     UpdateUrlbarSearchSplitterState();
 

browser/base/content/browser.xhtml

@@ -78,7 +78,6 @@
   <link rel="localization" href="browser/panelUI.ftl"/>
   <link rel="localization" href="browser/places.ftl"/>
   <link rel="localization" href="browser/protectionsPanel.ftl"/>
-  <link rel="localization" href="browser/reportBrokenSite.ftl"/>
   <link rel="localization" href="browser/screenshots.ftl"/>
   <link rel="localization" href="browser/search.ftl"/>
   <link rel="localization" href="browser/sidebarMenu.ftl"/>

browser/base/content/macWindow.inc.xhtml

@@ -14,7 +14,6 @@
   <html:link rel="localization" href="browser/browserSets.ftl"/>
   <html:link rel="localization" href="browser/firefoxView.ftl"/>
   <html:link rel="localization" href="browser/menubar.ftl"/>
-  <html:link rel="localization" href="browser/reportBrokenSite.ftl"/>
   <html:link rel="localization" href="browser/screenshots.ftl"/>
   <html:link rel="localization" href="toolkit/branding/accounts.ftl"/>
   <html:link rel="localization" href="toolkit/branding/brandings.ftl"/>

browser/base/content/main-popupset.inc.xhtml

@@ -500,7 +500,6 @@
 #include ../../components/controlcenter/content/protectionsPanel.inc.xhtml
 #include ../../components/downloads/content/downloadsPanel.inc.xhtml
 #include ../../components/translations/content/translationsPanel.inc.xhtml
-#include ../../components/reportbrokensite/content/reportBrokenSitePanel.inc.xhtml
 #include browser-allTabsMenu.inc.xhtml
 
   <tooltip id="dynamic-shortcut-tooltip"

browser/base/content/utilityOverlay.js

@@ -20,7 +20,6 @@ ChromeUtils.defineESModuleGetters(this, {
   ExtensionSettingsStore:
     "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
-  ReportBrokenSite: "resource:///modules/ReportBrokenSite.sys.mjs",
   ShellService: "resource:///modules/ShellService.sys.mjs",
   URILoadingHelper: "resource:///modules/URILoadingHelper.sys.mjs",
 });
@@ -541,6 +540,30 @@ function buildHelpMenu() {
     gSafeBrowsing.setReportPhishingMenu();
   }
 
+  // We're testing to see if the WebCompat team's "Report Site Issue"
+  // access point makes sense in the Help menu. Normally checking this
+  // pref wouldn't be enough, since there's also the case that the
+  // add-on has somehow been disabled by the user or third-party software
+  // without flipping the pref. Since this add-on is only used on pre-release
+  // channels, and since the jury is still out on whether or not the Help menu
+  // is the right place for this item, we're going to do a least-effort
+  // approach here and assume that the pref is enough to determine whether the
+  // menuitem should appear.
+  //
+  // See bug 1690573 for further details.
+  let reportSiteIssueEnabled = Services.prefs.getBoolPref(
+    "extensions.webcompat-reporter.enabled",
+    false
+  );
+  let reportSiteIssue = document.getElementById("help_reportSiteIssue");
+  reportSiteIssue.hidden = !reportSiteIssueEnabled;
+  if (reportSiteIssueEnabled) {
+    let uri = gBrowser.currentURI;
+    let isReportablePage =
+      uri && (uri.schemeIs("http") || uri.schemeIs("https"));
+    reportSiteIssue.disabled = !isReportablePage;
+  }
+
   if (NimbusFeatures.deviceMigration.getVariable("helpMenuHidden")) {
     let helpMenuItem = document.getElementById("helpSwitchDevice");
     helpMenuItem.hidden = true;

browser/components/controlcenter/content/protectionsPanel.inc.xhtml

@@ -9,7 +9,7 @@
        role="alertdialog"
        noautofocus="true"
        aria-labelledby="protections-popup-main-header-label"
-       onpopupshown="gProtectionsHandler.onPopupShown(event);ReportBrokenSite.updateParentMenu(event)"
+       onpopupshown="gProtectionsHandler.onPopupShown(event);"
        onpopuphidden="gProtectionsHandler.onPopupHidden(event);"
        orient="vertical">
 
@@ -63,13 +63,6 @@
           </hbox>
         </vbox>
 
-        <toolbarseparator observes="cmd_reportBrokenSite"></toolbarseparator>
-        <toolbarbutton id="protections-popup-report-broken-site-button"
-                     command="cmd_reportBrokenSite"
-                     class="subviewbutton subviewbutton-nav"
-                     data-l10n-id="protections-panel-report-broken-site"
-                     closemenu="none"/>
-
         <!-- Tracking Protection Section -->
         <toolbarseparator></toolbarseparator>
         <vbox id="tracking-protection-container" class="protections-popup-section">

browser/components/moz.build

@@ -51,7 +51,6 @@ DIRS += [
     "prompts",
     "protections",
     "protocolhandler",
-    "reportbrokensite",
     "resistfingerprinting",
     "screenshots",
     "search",