diff --git a/chromium/pages/devtools/index.html b/chromium/pages/devtools/index.html
index 0e6df7285c74..02711dc76d20 100644
--- a/chromium/pages/devtools/index.html
+++ b/chromium/pages/devtools/index.html
@@ -3,6 +3,7 @@
+
diff --git a/chromium/pages/devtools/ux.js b/chromium/pages/devtools/ux.js
index e88391c0f486..8244cbf2df55 100644
--- a/chromium/pages/devtools/ux.js
+++ b/chromium/pages/devtools/ux.js
@@ -1,7 +1,17 @@
+/* global sendMessage */
+
"use strict";
-chrome.devtools.panels.create("HTTPS Everywhere",
- "/images/icons/icon-active-38.png",
- "/pages/devtools/panel.html",
- function() { }
-);
+const defaultOptions = {
+ showDevtoolsTab: true
+};
+
+sendMessage("get_option", defaultOptions, item => {
+ if (item.showDevtoolsTab) {
+ chrome.devtools.panels.create("HTTPS Everywhere",
+ "/images/icons/icon-active-38.png",
+ "/pages/devtools/panel.html",
+ function() { }
+ );
+ }
+});
diff --git a/chromium/pages/options/index.html b/chromium/pages/options/index.html
index 4bca2a72c133..698bff14ce42 100644
--- a/chromium/pages/options/index.html
+++ b/chromium/pages/options/index.html
@@ -21,6 +21,10 @@
+
+
+
+
diff --git a/chromium/pages/options/style.css b/chromium/pages/options/style.css
index 9b570806b276..f30769daed81 100644
--- a/chromium/pages/options/style.css
+++ b/chromium/pages/options/style.css
@@ -6,7 +6,7 @@
margin-bottom: 20px;
}
-.general-settings-wrapper#mixed-rulesets-wrapper{
+.general-settings-wrapper#show-devtools-tab-wrapper{
margin-bottom: 20px;
}
diff --git a/chromium/pages/options/ux.js b/chromium/pages/options/ux.js
index 1a380edc4dbf..bc74ffabcb9c 100644
--- a/chromium/pages/options/ux.js
+++ b/chromium/pages/options/ux.js
@@ -33,17 +33,20 @@ document.addEventListener("DOMContentLoaded", () => {
const showCounter = document.getElementById("showCounter");
const autoUpdateRulesets = document.getElementById("autoUpdateRulesets");
const enableMixedRulesets = document.getElementById("enableMixedRulesets");
+ const showDevtoolsTab = document.getElementById("showDevtoolsTab");
const defaultOptions = {
showCounter: true,
autoUpdateRulesets: true,
enableMixedRulesets: false,
+ showDevtoolsTab: true
};
sendMessage("get_option", defaultOptions, item => {
showCounter.checked = item.showCounter;
autoUpdateRulesets.checked = item.autoUpdateRulesets;
enableMixedRulesets.checked = item.enableMixedRulesets;
+ showDevtoolsTab.checked = item.showDevtoolsTab;
showCounter.addEventListener("change", () => {
sendMessage("set_option", { showCounter: showCounter.checked });
@@ -55,7 +58,11 @@ document.addEventListener("DOMContentLoaded", () => {
enableMixedRulesets.addEventListener("change", () => {
sendMessage("set_option", { enableMixedRulesets: enableMixedRulesets.checked });
- })
+ });
+
+ showDevtoolsTab.addEventListener("change", () => {
+ sendMessage("set_option", { showDevtoolsTab: showDevtoolsTab.checked });
+ });
});
document.onkeydown = function(evt) {
diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd
index 0a1eadd65a5c..d5094d06529b 100644
--- a/src/chrome/locale/en/https-everywhere.dtd
+++ b/src/chrome/locale/en/https-everywhere.dtd
@@ -17,6 +17,7 @@
+