From 34327b87754af1ded5d31d0db25fb8f403385562 Mon Sep 17 00:00:00 2001
From: matteo <schuepbach.matteo@gmail.com>
Date: Wed, 14 Jul 2021 22:01:41 +0200
Subject: [PATCH] Add support for chrome browsers

---
 content_scripts/base-url-switcher.js |  2 +-
 options/options.js                   |  9 ++-------
 popup/choose_url.js                  | 21 +++++++++------------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/content_scripts/base-url-switcher.js b/content_scripts/base-url-switcher.js
index 93d748a..21de3d0 100644
--- a/content_scripts/base-url-switcher.js
+++ b/content_scripts/base-url-switcher.js
@@ -4,7 +4,7 @@
   }
   window.hasRun = true;
 
-  browser.runtime.onMessage.addListener((message) => {
+  chrome.runtime.onMessage.addListener((message) => {
     if (message.command === "switch_base_url") {
       window.location =
         message.baseUrl +
diff --git a/options/options.js b/options/options.js
index f072ed9..71c7cd1 100644
--- a/options/options.js
+++ b/options/options.js
@@ -1,6 +1,6 @@
 function saveOptions(e) {
   e.preventDefault();
-  browser.storage.local.set({
+  chrome.storage.local.set({
     local: document.querySelector("#local").value,
     test: document.querySelector("#test").value,
     prod: document.querySelector("#prod").value,
@@ -14,12 +14,7 @@ function restoreOptions() {
     document.querySelector("#prod").value = restoredSettings.prod || "";
   }
 
-  function onError(error) {
-    console.log(`Error: ${error}`);
-  }
-
-  const gettingStoredSettings = browser.storage.local.get();
-  gettingStoredSettings.then(updateUI, onError);
+  chrome.storage.local.get(null, updateUI);
 }
 
 document.addEventListener("DOMContentLoaded", restoreOptions);
diff --git a/popup/choose_url.js b/popup/choose_url.js
index 61d961b..b5d2e70 100644
--- a/popup/choose_url.js
+++ b/popup/choose_url.js
@@ -1,11 +1,12 @@
-function listenForClicks() {
+async function listenForClicks() {
   document.addEventListener("click", function (e) {
     if (!e.target.classList.contains("button")) {
       return;
     }
 
-    browser.tabs.query({ active: true, currentWindow: true }).then((tabs) => {
-      browser.tabs.sendMessage(tabs[0].id, {
+    let queryOptions = { active: true, currentWindow: true };
+    chrome.tabs.query(queryOptions, (tabs) => {
+      chrome.tabs.sendMessage(tabs[0].id, {
         command: "switch_base_url",
         baseUrl: e.target.getAttribute("data-url"),
       });
@@ -19,13 +20,9 @@ function setUrls(settings) {
   document.querySelector("#prod").setAttribute("data-url", settings.prod);
 }
 
-function onError(e) {
-  console.error(e);
-}
+chrome.storage.local.get(null, setUrls);
 
-const gettingStoredSettings = browser.storage.local.get();
-gettingStoredSettings.then(setUrls, onError);
-
-browser.tabs
-  .executeScript({ file: "/content_scripts/base-url-switcher.js" })
-  .then(listenForClicks);
+chrome.tabs.executeScript(
+  { file: "/content_scripts/base-url-switcher.js" },
+  listenForClicks
+);