From 7a3315d75d91e37f69cf23faa0e5b189ad548e52 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 22 Oct 2019 20:23:03 -0400
Subject: [PATCH] Use chrome.runtime.getURL instead of chrome.extension.getURL

---
 ext/bg/js/api.js        | 4 ++--
 ext/bg/js/backend.js    | 2 +-
 ext/bg/js/context.js    | 4 ++--
 ext/bg/js/translator.js | 2 +-
 ext/fg/js/popup.js      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 93d9c155..999ea337 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -153,7 +153,7 @@ async function apiCommandExec(command, params) {
 }
 apiCommandExec.handlers = {
     search: async (params) => {
-        const url = chrome.extension.getURL('/bg/search.html');
+        const url = chrome.runtime.getURL('/bg/search.html');
         if (!(params && params.newTab)) {
             try {
                 const tab = await apiFindTab(1000, (url2) => (
@@ -181,7 +181,7 @@ apiCommandExec.handlers = {
             chrome.runtime.openOptionsPage();
         } else {
             const manifest = chrome.runtime.getManifest();
-            const url = chrome.extension.getURL(manifest.options_ui.page);
+            const url = chrome.runtime.getURL(manifest.options_ui.page);
             chrome.tabs.create({url});
         }
     },
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index f29230a2..23d876f6 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -45,7 +45,7 @@ class Backend {
 
         const options = this.getOptionsSync(this.optionsContext);
         if (options.general.showGuide) {
-            chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
+            chrome.tabs.create({url: chrome.runtime.getURL('/bg/guide.html')});
         }
 
         this.isPreparedResolve();
diff --git a/ext/bg/js/context.js b/ext/bg/js/context.js
index 8e1dbce6..3fb27f0d 100644
--- a/ext/bg/js/context.js
+++ b/ext/bg/js/context.js
@@ -55,8 +55,8 @@ $(document).ready(utilAsync(() => {
 
     const manifest = chrome.runtime.getManifest();
 
-    setupButtonEvents('.action-open-search', 'search', chrome.extension.getURL('/bg/search.html'));
-    setupButtonEvents('.action-open-options', 'options', chrome.extension.getURL(manifest.options_ui.page));
+    setupButtonEvents('.action-open-search', 'search', chrome.runtime.getURL('/bg/search.html'));
+    setupButtonEvents('.action-open-options', 'options', chrome.runtime.getURL(manifest.options_ui.page));
     setupButtonEvents('.action-open-help', 'help');
 
     const optionsContext = {
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index ee012d96..9d90136b 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -31,7 +31,7 @@ class Translator {
         }
 
         if (!this.deinflector) {
-            const url = chrome.extension.getURL('/bg/lang/deinflect.json');
+            const url = chrome.runtime.getURL('/bg/lang/deinflect.json');
             const reasons = await requestJson(url, 'GET');
             this.deinflector = new Deinflector(reasons);
         }
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index b5eb9fe2..1f9317e0 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -30,7 +30,7 @@ class Popup {
         this.container.className = 'yomichan-float';
         this.container.addEventListener('mousedown', e => e.stopPropagation());
         this.container.addEventListener('scroll', e => e.stopPropagation());
-        this.container.setAttribute('src', chrome.extension.getURL('/fg/float.html'));
+        this.container.setAttribute('src', chrome.runtime.getURL('/fg/float.html'));
         this.container.style.width = '0px';
         this.container.style.height = '0px';
         this.injectPromise = null;