aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <infra@servo.org>2023-07-13 11:25:21 +0200
committerGitHub <noreply@github.com>2023-07-13 11:25:21 +0200
commit19590bfe460f97847271563c8f1a81d35f9ef2be (patch)
tree51ce3a7e5693ab2b78c0d14e2b278b6396066c89
parentd5202a4a98027b443a6cc04b4b977807131efd5a (diff)
parent8e7c45b8ff82594db78d16a65a5da6a9a2142e7f (diff)
downloadservo-auto.tar.gz
servo-auto.zip
Auto merge of #29995 - servo:minibrowser_prefs, r=delanauto
Minibrowser: Introduce minibrowser.enabled prefs Introducing minibrowser.enabled prefs in preparation of #29976 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
-rw-r--r--components/config/prefs.rs3
-rw-r--r--resources/prefs.json1
2 files changed, 4 insertions, 0 deletions
diff --git a/components/config/prefs.rs b/components/config/prefs.rs
index 82f3884bf70..e4b32a92525 100644
--- a/components/config/prefs.rs
+++ b/components/config/prefs.rs
@@ -456,6 +456,9 @@ mod gen {
enabled: bool,
}
},
+ minibrowser: {
+ enabled: bool,
+ },
network: {
enforce_tls: {
enabled: bool,
diff --git a/resources/prefs.json b/resources/prefs.json
index 1881a525087..ef12de1236c 100644
--- a/resources/prefs.json
+++ b/resources/prefs.json
@@ -104,6 +104,7 @@
"layout.writing-mode.enabled": false,
"media.glvideo.enabled": false,
"media.testing.enabled": false,
+ "minibrowser.enabled": false,
"network.enforce_tls.enabled": false,
"network.enforce_tls.localhost": false,
"network.enforce_tls.onion": false,