From 66ea60801dbf285c4d154123cab2f17e7286580c Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Fri, 23 Jul 2021 07:12:06 +0000
Subject: [PATCH] Bug 1721540 - [devtools] Remove the preference behind
 devtools color-scheme simulation buttons r=nchevobbe

Depends on D120441

Differential Revision: https://phabricator.services.mozilla.com/D120442
---
 browser/app/profile/firefox.js                |  2 --
 devtools/client/inspector/index.xhtml         |  4 +--
 devtools/client/inspector/rules/rules.js      | 27 ++++++-------------
 .../browser_rules_color_scheme_simulation.js  |  1 -
 ...owser_rules_color_scheme_simulation_rdm.js |  1 -
 5 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index bd1450144b86..ca2aeb101546 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -2201,8 +2201,6 @@ pref("devtools.inspector.compatibility.enabled", true);
 #else
 pref("devtools.inspector.compatibility.enabled", false);
 #endif
-// Enable color scheme simulation in the inspector.
-pref("devtools.inspector.color-scheme-simulation.enabled", true);
 // Enable overflow debugging in the inspector.
 pref("devtools.overflow.debugging.enabled", true);
 
diff --git a/devtools/client/inspector/index.xhtml b/devtools/client/inspector/index.xhtml
index ac830e706830..554f02aa6fda 100644
--- a/devtools/client/inspector/index.xhtml
+++ b/devtools/client/inspector/index.xhtml
@@ -105,8 +105,8 @@
               <button id="pseudo-class-panel-toggle" data-localization="title=inspector.togglePseudo.tooltip" class="devtools-button"></button>
               <button id="class-panel-toggle" data-localization="title=inspector.classPanel.toggleClass.tooltip" class="devtools-button"></button>
               <button id="ruleview-add-rule-button" data-localization="title=inspector.addRule.tooltip" class="devtools-button"></button>
-              <button id="color-scheme-simulation-light-toggle" data-localization="title=inspector.colorSchemeSimulationLight.tooltip" class="devtools-button" hidden=""></button>
-              <button id="color-scheme-simulation-dark-toggle" data-localization="title=inspector.colorSchemeSimulationDark.tooltip" class="devtools-button" hidden=""></button>
+              <button id="color-scheme-simulation-light-toggle" data-localization="title=inspector.colorSchemeSimulationLight.tooltip" class="devtools-button"></button>
+              <button id="color-scheme-simulation-dark-toggle" data-localization="title=inspector.colorSchemeSimulationDark.tooltip" class="devtools-button"></button>
               <button id="print-simulation-toggle" data-localization="title=inspector.printSimulation.tooltip" class="devtools-button" hidden=""></button>
             </div>
           </div>
diff --git a/devtools/client/inspector/rules/rules.js b/devtools/client/inspector/rules/rules.js
index b89e43209a37..ab28a7493d6d 100644
--- a/devtools/client/inspector/rules/rules.js
+++ b/devtools/client/inspector/rules/rules.js
@@ -515,25 +515,14 @@ CssRuleView.prototype = {
       );
     }
 
-    // Show the color scheme simulation toggle button if the feature pref is
-    // enabled.
-    if (
-      Services.prefs.getBoolPref(
-        "devtools.inspector.color-scheme-simulation.enabled"
-      )
-    ) {
-      this.colorSchemeLightSimulationButton.removeAttribute("hidden");
-      this.colorSchemeDarkSimulationButton.removeAttribute("hidden");
-
-      this.colorSchemeLightSimulationButton.addEventListener(
-        "click",
-        this._onToggleLightColorSchemeSimulation
-      );
-      this.colorSchemeDarkSimulationButton.addEventListener(
-        "click",
-        this._onToggleDarkColorSchemeSimulation
-      );
-    }
+    this.colorSchemeLightSimulationButton.addEventListener(
+      "click",
+      this._onToggleLightColorSchemeSimulation
+    );
+    this.colorSchemeDarkSimulationButton.addEventListener(
+      "click",
+      this._onToggleDarkColorSchemeSimulation
+    );
   },
 
   /**
diff --git a/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation.js b/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation.js
index 56f8c3c5f8c8..db9c8943b479 100644
--- a/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation.js
+++ b/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation.js
@@ -7,7 +7,6 @@
 const TEST_URI = URL_ROOT + "doc_media_queries.html";
 
 add_task(async function() {
-  await pushPref("devtools.inspector.color-scheme-simulation.enabled", true);
   await addTab(TEST_URI);
   const { inspector, view, toolbox } = await openRuleView();
 
diff --git a/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation_rdm.js b/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation_rdm.js
index b109e2fab618..63ccf6f28415 100644
--- a/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation_rdm.js
+++ b/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation_rdm.js
@@ -10,7 +10,6 @@ const ResponsiveUIManager = require("devtools/client/responsive/manager");
 const ResponsiveMessageHelper = require("devtools/client/responsive/utils/message");
 
 add_task(async function() {
-  await pushPref("devtools.inspector.color-scheme-simulation.enabled", true);
   // Use a local file for the device list, otherwise the panel tries to reach an external
   // URL, which makes the test fail.
   await pushPref(