Merge branch 'manifest_v3' of https://github.com/metoule/deezer-control…

… into manifest_v3
metoule · Jun 1, 2024 · e683374 · e683374
2 parents 1458e36 + 8446cc5
commit e683374
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/manifest.json b/manifest.json
@@ -12,7 +12,8 @@
   },
   "action": {
     "default_icon": "imgs/icons/deezer_19x19.png",
-    "default_title": "__MSG_defaultTitle__"
+    "default_title": "__MSG_defaultTitle__",
+    "default_popup": "popup.html"
   },
   "background": {
     "service_worker": "scripts/service_worker.js",
@@ -25,11 +26,7 @@
       "js": ["scripts/player_listener.js", "scripts/deezer/bootstrap.js"]
     }
   ],
-<<<<<<< HEAD
-  "permissions": ["notifications", "tabs", "webNavigation", "storage"],
-=======
   "permissions": ["notifications", "storage", "tabs", "webNavigation"],
->>>>>>> 7032e2b (Migrate browser actions)
   "host_permissions": ["*://*.deezer.com/*"],
   "optional_host_permissions": ["*://*/*"],
   "content_security_policy": {

diff --git a/scripts/service_worker.js b/scripts/service_worker.js
@@ -7,4 +7,4 @@ console.log('service worker loaded', version);
 chrome.action.onClicked.addListener(function() 
 {
 	chrome.tabs.create({ url: '/options.html' });
-});
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ console.log('service worker loaded', version); @@
     chrome.action.onClicked.addListener(function()
     {
     	chrome.tabs.create({ url: '/options.html' });
-    });
+    });