Revert "Bug 1946600 - Add browserSetting verticalTabs. r=zombie,webidl,smaug" for causing bc failures at browser_unified_extensions_overflowable_toolbar.js

This reverts commit 71c340f.

Author: chorotan

browser/components/extensions/test/browser/browser.toml

@@ -55,8 +55,6 @@ skip-if = [
 
 ["browser_ExtensionControlledPopup.js"]
 
-["browser_browserSetting_vertical_tabs.js"]
-
 ["browser_ext_action_popup_allowed_urls.js"]
 
 ["browser_ext_activeScript.js"]

browser/components/extensions/test/browser/browser_browserSetting_vertical_tabs.js

@@ -84,9 +84,6 @@ interface ExtensionBrowserSettings {
   [Replaceable]
   readonly attribute ExtensionSetting zoomSiteSpecific;
 
-  [Replaceable]
-  readonly attribute ExtensionSetting verticalTabs;
-
   // API child namespaces.
 
   [Replaceable, SameObject,

dom/webidl/ExtensionBrowserSettings.webidl

@@ -334,27 +334,6 @@ ExtensionPreferencesManager.addSetting("zoomSiteSpecific", {
   },
 });
 
-ExtensionPreferencesManager.addSetting("verticalTabs", {
-  permission: "browserSettings",
-  prefNames: ["sidebar.verticalTabs"],
-
-  setCallback(value) {
-    return { [this.prefNames[0]]: value };
-  },
-
-  getCallback() {
-    return Services.prefs.getBoolPref("sidebar.verticalTabs");
-  },
-
-  validate() {
-    if (AppConstants.platform == "android") {
-      throw new ExtensionError(
-        `android is not a supported platform for verticalTabs.`
-      );
-    }
-  },
-});
-
 this.browserSettings = class extends ExtensionAPI {
   homePageOverrideListener(fire) {
     let listener = () => {
@@ -419,9 +398,6 @@ this.browserSettings = class extends ExtensionAPI {
       });
     }
 
-    const verticalTabsSettingsAPI = makeSettingsAPI("verticalTabs");
-    const verticalTabsSet = verticalTabsSettingsAPI.set;
-
     return {
       browserSettings: {
         allowPopupsForUserEvents: makeSettingsAPI("allowPopupsForUserEvents"),
@@ -603,16 +579,6 @@ this.browserSettings = class extends ExtensionAPI {
             );
           },
         }),
-        verticalTabs: Object.assign(verticalTabsSettingsAPI, {
-          set: details => {
-            if (typeof details.value !== "boolean") {
-              throw new ExtensionError(
-                `${details.value} is not a valid value for verticalTabs.`
-              );
-            }
-            return verticalTabsSet(details);
-          },
-        }),
         colorManagement: {
           mode: makeSettingsAPI("colorManagement.mode"),
           useNativeSRGB: makeSettingsAPI("colorManagement.useNativeSRGB"),

toolkit/components/extensions/parent/ext-browserSettings.js

@@ -110,10 +110,6 @@
       "zoomSiteSpecific": {
         "$ref": "types.Setting",
         "description": "This boolean setting controls whether zoom is applied on a per-site basis or to the current tab only. If privacy.resistFingerprinting is true, this setting has no effect and zoom is applied to the current tab only."
-      },
-      "verticalTabs": {
-        "$ref": "types.Setting",
-        "description": "This boolean setting controls whether vertical tabs are enabled."
       }
     }
   },

toolkit/components/extensions/schemas/browser_settings.json

@@ -42,7 +42,6 @@ add_task(async function test_browser_settings() {
     "browser.display.use_document_fonts": 1,
     "browser.zoom.full": true,
     "browser.zoom.siteSpecific": true,
-    "sidebar.verticalTabs": false,
   };
 
   async function background() {
@@ -318,16 +317,6 @@ add_task(async function test_browser_settings() {
     "gfx.webrender.compositor": true,
   });
 
-  if (AppConstants.platform !== "android") {
-    await testSetting("verticalTabs", false, {
-      "sidebar.verticalTabs": false,
-    });
-
-    await testSetting("verticalTabs", true, {
-      "sidebar.verticalTabs": true,
-    });
-  }
-
   await extension.unload();
   await promiseShutdownManager();
 });
@@ -388,18 +377,6 @@ add_task(async function test_bad_value() {
       "zoomSiteSpecific.set rejects with an invalid value."
     );
 
-    await browser.test.assertRejects(
-      browser.browserSettings.verticalTabs.set({ value: 0 }),
-      /0 is not a valid value for verticalTabs/,
-      "verticalTabs.set rejects with an invalid value."
-    );
-
-    await browser.test.assertRejects(
-      browser.browserSettings.verticalTabs.set({ value: "bad" }),
-      /bad is not a valid value for verticalTabs/,
-      "verticalTabs.set rejects with an invalid value."
-    );
-
     browser.test.sendMessage("done");
   }
 
@@ -439,30 +416,6 @@ add_task(async function test_bad_value_android() {
       "closeTabsByDoubleClick.clear rejects on Android."
     );
 
-    await browser.test.assertRejects(
-      browser.browserSettings.verticalTabs.set({ value: "bad" }),
-      /bad is not a valid value for verticalTabs/,
-      "verticalTabs.set rejects with an invalid value on Android."
-    );
-
-    await browser.test.assertRejects(
-      browser.browserSettings.verticalTabs.set({ value: true }),
-      /android is not a supported platform for verticalTabs/,
-      "verticalTabs.set rejects on Android."
-    );
-
-    await browser.test.assertRejects(
-      browser.browserSettings.verticalTabs.get({}),
-      /android is not a supported platform for verticalTabs/,
-      "verticalTabs.get rejects on Android."
-    );
-
-    await browser.test.assertRejects(
-      browser.browserSettings.verticalTabs.clear({}),
-      /android is not a supported platform for verticalTabs/,
-      "verticalTabs.clear rejects on Android."
-    );
-
     browser.test.sendMessage("done");
   }
 

toolkit/components/extensions/test/xpcshell/test_ext_browserSettings.js

@@ -25,8 +25,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(
     mOpenSearchResultsInNewTabsSetting, mOpenUrlbarResultsInNewTabsSetting,
     mWebNotificationsDisabledSetting, mOverrideDocumentColorsSetting,
     mOverrideContentColorSchemeSetting, mUseDocumentFontsSetting,
-    mVerticalTabsSetting, mZoomFullPageSetting, mZoomSiteSpecificSetting,
-    mColorManagementNamespace);
+    mZoomFullPageSetting, mZoomSiteSpecificSetting, mColorManagementNamespace);
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ExtensionBrowserSettings)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
@@ -72,8 +71,6 @@ NS_IMPL_WEBEXT_SETTING(ExtensionBrowserSettings, u"zoomFullPage"_ns,
                        ZoomFullPage)
 NS_IMPL_WEBEXT_SETTING(ExtensionBrowserSettings, u"zoomSiteSpecific"_ns,
                        ZoomSiteSpecific)
-NS_IMPL_WEBEXT_SETTING(ExtensionBrowserSettings, u"verticalTabs"_ns,
-                       VerticalTabs)
 
 ExtensionBrowserSettings::ExtensionBrowserSettings(
     nsIGlobalObject* aGlobal, ExtensionBrowser* aExtensionBrowser)

toolkit/components/extensions/webidl-api/ExtensionBrowserSettings.cpp

@@ -67,7 +67,6 @@ class ExtensionBrowserSettings final : public nsISupports,
   ExtensionSetting* OverrideDocumentColors();
   ExtensionSetting* OverrideContentColorScheme();
   ExtensionSetting* UseDocumentFonts();
-  ExtensionSetting* VerticalTabs();
   ExtensionSetting* ZoomFullPage();
   ExtensionSetting* ZoomSiteSpecific();
 
@@ -98,7 +97,6 @@ class ExtensionBrowserSettings final : public nsISupports,
   RefPtr<ExtensionSetting> mOverrideDocumentColorsSetting;
   RefPtr<ExtensionSetting> mOverrideContentColorSchemeSetting;
   RefPtr<ExtensionSetting> mUseDocumentFontsSetting;
-  RefPtr<ExtensionSetting> mVerticalTabsSetting;
   RefPtr<ExtensionSetting> mZoomFullPageSetting;
   RefPtr<ExtensionSetting> mZoomSiteSpecificSetting;
   RefPtr<ExtensionBrowserSettingsColorManagement> mColorManagementNamespace;