Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit bbdb0ee

Browse files
committed
✨ Vivaldi (and probibly Opera) importer
Fixes #186
1 parent 1a1c6c6 commit bbdb0ee

File tree

3 files changed

+35
-10
lines changed

3 files changed

+35
-10
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/browser/components/migration/ChromeMigrationUtils.sys.mjs b/browser/components/migration/ChromeMigrationUtils.sys.mjs
2+
--- a/browser/components/migration/ChromeMigrationUtils.sys.mjs
3+
+++ b/browser/components/migration/ChromeMigrationUtils.sys.mjs
4+
@@ -297,12 +297,12 @@
5+
"Chrome Dev": ["google-chrome-unstable"],
6+
Chromium: ["chromium"],
7+
"Opera GX": ["Opera-GX"],
8+
// Canary is not available on Linux.
9+
// Edge is not available on Linux.
10+
- Opera: ["Opera"],
11+
- Vivaldi: ["Vivaldi"],
12+
+ Opera: ["opera"],
13+
+ Vivaldi: ["vivaldi"],
14+
},
15+
};
16+
let subfolders = SUB_DIRECTORIES[AppConstants.platform][chromeProjectName];
17+
if (!subfolders) {
18+
return null;
19+

src/browser/app/profile/firefox-js.patch

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
2-
index 9b56ba74cff12f029b6d8910ff487a216a15194f..ff91ce488ddd65c148633eb3e8e65044da47bf37 100644
2+
index 9b56ba74cff12f029b6d8910ff487a216a15194f..603a2b90f800b8f702ab2c1c61ce922c11459ce6 100644
33
--- a/browser/app/profile/firefox.js
44
+++ b/browser/app/profile/firefox.js
55
@@ -19,6 +19,8 @@
@@ -39,7 +39,15 @@ index 9b56ba74cff12f029b6d8910ff487a216a15194f..ff91ce488ddd65c148633eb3e8e65044
3939
#if defined(XP_LINUX) || defined(XP_WIN)
4040
// Allows us to adjust the priority of child processes at the OS level
4141
pref("dom.ipc.processPriorityManager.enabled", true);
42-
@@ -2156,10 +2153,10 @@ pref("browser.migrate.opera-gx.enabled", false);
42+
@@ -2149,17 +2146,15 @@ pref("browser.migrate.edge.enabled", true);
43+
pref("browser.migrate.firefox.enabled", true);
44+
pref("browser.migrate.ie.enabled", true);
45+
pref("browser.migrate.safari.enabled", true);
46+
-pref("browser.migrate.opera.enabled", false);
47+
-pref("browser.migrate.vivaldi.enabled", false);
48+
-pref("browser.migrate.opera-gx.enabled", false);
49+
+// Temporarily override browser.migrate for opera and vivaldi
50+
4351
pref("browser.migrate.content-modal.enabled", false);
4452

4553
pref("extensions.pocket.api", "api.getpocket.com");
@@ -52,7 +60,7 @@ index 9b56ba74cff12f029b6d8910ff487a216a15194f..ff91ce488ddd65c148633eb3e8e65044
5260
pref("extensions.pocket.onSaveRecs.locales", "en-US,en-GB,en-CA");
5361

5462
// Enable Pocket button home panel for non link pages.
55-
@@ -2290,8 +2287,9 @@ pref("toolkit.coverage.enabled", false);
63+
@@ -2290,8 +2285,9 @@ pref("toolkit.coverage.enabled", false);
5664
pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org");
5765

5866
// Discovery prefs

src/browser/app/profile/pulse-browser.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
//
55
// Note: You must have semicolons at the end of each line in user setting files
66

7+
// Enable importers for other browsers
8+
pref('browser.migrate.vivaldi.enabled', true);
9+
pref('browser.migrate.opera-gx.enabled', true);
10+
pref('browser.migrate.opera.enabled', true);
11+
712
// Enable downloading DRM.
813
pref('media.eme.enabled', true);
914

@@ -57,10 +62,3 @@ pref("app.releaseNotesURL.aboutDialog", "https://discord.gg/Y3khyEtAgS");
5762
pref("extensions.pocket.enabled", false);
5863

5964
#include better-fox.js
60-
RL", "https://discord.gg/Y3khyEtAgS");
61-
pref("app.releaseNotesURL.aboutDialog", "https://discord.gg/Y3khyEtAgS");
62-
63-
// This pref needs to be here to not break context menus (GH#169)
64-
pref("extensions.pocket.enabled", false);
65-
66-
#include better-fox.js

0 commit comments

Comments
 (0)