From 41940c17a2a6f247cee3a1f466000a92cf0f7641 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Sat, 5 Nov 2022 06:49:00 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Chrome=20Tabs=20instantiat?= =?UTF-8?q?ion=20method=20renamed=20to=20newTabContainer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc Nuri --- src/chrome-tabs/__tests__/index.test.js | 4 ++-- src/chrome-tabs/index.js | 8 ++++++-- src/main/index.js | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/chrome-tabs/__tests__/index.test.js b/src/chrome-tabs/__tests__/index.test.js index 6d0813c6..8b3cd68b 100644 --- a/src/chrome-tabs/__tests__/index.test.js +++ b/src/chrome-tabs/__tests__/index.test.js @@ -28,10 +28,10 @@ describe('Chrome Tabs Module module test suite', () => { }; chromeTabs = require('../'); }); - describe('initTabContainer', () => { + describe('newTabContainer', () => { test('webPreferences is sandboxed and has no node integration', () => { // When - chromeTabs.initTabContainer(mainWindow); + chromeTabs.newTabContainer(mainWindow); // Then const BrowserView = require('electron').BrowserView; expect(BrowserView).toHaveBeenCalledTimes(1); diff --git a/src/chrome-tabs/index.js b/src/chrome-tabs/index.js index d22ad717..b06c2c57 100644 --- a/src/chrome-tabs/index.js +++ b/src/chrome-tabs/index.js @@ -42,7 +42,11 @@ const handleContextMenu = (event, params) => { menu.popup({x, y}); }; -const initTabContainer = () => { +/** + * Creates a new BrowserView instance with the Chrome Tabs + * @returns {Electron.CrossProcessExports.BrowserView} + */ +const newTabContainer = () => { const tabContainer = new BrowserView({webPreferences}); tabContainer.isTabContainer = true; tabContainer.setAutoResize({width: false, horizontal: false, height: false, vertical: false}); @@ -55,5 +59,5 @@ const initTabContainer = () => { const isNotTabContainer = bv => bv.isTabContainer !== true; module.exports = { - TABS_CONTAINER_HEIGHT, initTabContainer, isNotTabContainer + TABS_CONTAINER_HEIGHT, newTabContainer, isNotTabContainer }; diff --git a/src/main/index.js b/src/main/index.js index 59170d9a..a8ab1955 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -16,7 +16,7 @@ const {BrowserWindow, Notification, app, desktopCapturer, ipcMain: ipc, nativeTheme} = require('electron'); const {APP_EVENTS} = require('../constants'); const {newAppMenu, isNotAppMenu} = require('../app-menu'); -const {TABS_CONTAINER_HEIGHT, initTabContainer, isNotTabContainer} = require('../chrome-tabs'); +const {TABS_CONTAINER_HEIGHT, newTabContainer, isNotTabContainer} = require('../chrome-tabs'); const {openHelpDialog} = require('../help'); const {loadSettings, updateSettings, openSettingsDialog} = require('../settings'); const { @@ -182,7 +182,7 @@ const saveSettings = (_event, settings) => { tabManager.removeAll(); const viewsToDestroy = [currentBrowserView, tabContainer]; viewsToDestroy.forEach(view => view.webContents.destroy()); - tabContainer = initTabContainer(); + tabContainer = newTabContainer(); }; const initGlobalListeners = () => { @@ -200,7 +200,7 @@ const initGlobalListeners = () => { const browserVersionsReady = () => { app.userAgentFallback = userAgentForView(mainWindow); - tabContainer = initTabContainer(); + tabContainer = newTabContainer(); appMenu = newAppMenu(); };