fix: allow using BaseWindow

Author: samuelmaddock

packages/electron-chrome-extensions/src/browser/api/windows.ts

@@ -1,10 +1,9 @@
-import { BrowserWindow } from 'electron'
 import { ExtensionContext } from '../context'
 import { ExtensionEvent } from '../router'
 
 const debug = require('debug')('electron-chrome-extensions:windows')
 
-const getWindowState = (win: BrowserWindow): chrome.windows.Window['state'] => {
+const getWindowState = (win: Electron.BaseWindow): chrome.windows.Window['state'] => {
   if (win.isMaximized()) return 'maximized'
   if (win.isMinimized()) return 'minimized'
   if (win.isFullScreen()) return 'fullscreen'
@@ -47,7 +46,7 @@ export class WindowsAPI {
     debug(`Observing window[${windowId}]`)
   }
 
-  private createWindowDetails(win: BrowserWindow) {
+  private createWindowDetails(win: Electron.BaseWindow) {
     const details: Partial<chrome.windows.Window> = {
       id: win.id,
       focused: win.isFocused(),
@@ -62,7 +61,7 @@ export class WindowsAPI {
         })
         .map((tab) => this.ctx.store.tabDetailsCache.get(tab.id) as chrome.tabs.Tab)
         .filter(Boolean),
-      incognito: !win.webContents.session.isPersistent(),
+      incognito: this.ctx.session.isPersistent(),
       type: 'normal', // TODO
       state: getWindowState(win),
       alwaysOnTop: win.isAlwaysOnTop(),
@@ -73,7 +72,7 @@ export class WindowsAPI {
     return details
   }
 
-  private getWindowDetails(win: BrowserWindow) {
+  private getWindowDetails(win: Electron.BaseWindow) {
     if (this.ctx.store.windowDetailsCache.has(win.id)) {
       return this.ctx.store.windowDetailsCache.get(win.id)
     }

packages/electron-chrome-extensions/src/browser/impl.ts

@@ -2,16 +2,16 @@
 export interface ChromeExtensionImpl {
   createTab?(
     details: chrome.tabs.CreateProperties,
-  ): Promise<[Electron.WebContents, Electron.BrowserWindow]>
-  selectTab?(tab: Electron.WebContents, window: Electron.BrowserWindow): void
-  removeTab?(tab: Electron.WebContents, window: Electron.BrowserWindow): void
+  ): Promise<[Electron.WebContents, Electron.BaseWindow]>
+  selectTab?(tab: Electron.WebContents, window: Electron.BaseWindow): void
+  removeTab?(tab: Electron.WebContents, window: Electron.BaseWindow): void
 
   /**
    * Populate additional details to a tab descriptor which gets passed back to
    * background pages and content scripts.
    */
   assignTabDetails?(details: chrome.tabs.Tab, tab: Electron.WebContents): void
 
-  createWindow?(details: chrome.windows.CreateData): Promise<Electron.BrowserWindow>
-  removeWindow?(window: Electron.BrowserWindow): void
+  createWindow?(details: chrome.windows.CreateData): Promise<Electron.BaseWindow>
+  removeWindow?(window: Electron.BaseWindow): void
 }

packages/electron-chrome-extensions/src/browser/popup.ts

@@ -12,7 +12,7 @@ export interface PopupAnchorRect {
 interface PopupViewOptions {
   extensionId: string
   session: Session
-  parent: BrowserWindow
+  parent: Electron.BaseWindow
   url: string
   anchorRect: PopupAnchorRect
 }
@@ -33,7 +33,7 @@ export class PopupView {
   }
 
   browserWindow?: BrowserWindow
-  parent?: BrowserWindow
+  parent?: Electron.BaseWindow
   extensionId: string
 
   private anchorRect: PopupAnchorRect

packages/electron-chrome-extensions/src/browser/store.ts

@@ -11,7 +11,7 @@ export class ExtensionStore extends EventEmitter {
   tabs = new Set<Electron.WebContents>()
 
   /** Windows observed by the extensions system. */
-  windows = new Set<Electron.BrowserWindow>()
+  windows = new Set<Electron.BaseWindow>()
 
   lastFocusedWindowId?: number
 
@@ -21,10 +21,10 @@ export class ExtensionStore extends EventEmitter {
    * It's not possible to access the parent of a BrowserView so we must manage
    * this ourselves.
    */
-  tabToWindow = new WeakMap<Electron.WebContents, Electron.BrowserWindow>()
+  tabToWindow = new WeakMap<Electron.WebContents, Electron.BaseWindow>()
 
   /** Map of windows to their active tab. */
-  private windowToActiveTab = new WeakMap<Electron.BrowserWindow, Electron.WebContents>()
+  private windowToActiveTab = new WeakMap<Electron.BaseWindow, Electron.WebContents>()
 
   tabDetailsCache = new Map<number, Partial<chrome.tabs.Tab>>()
   windowDetailsCache = new Map<number, Partial<chrome.windows.Window>>()
@@ -49,7 +49,7 @@ export class ExtensionStore extends EventEmitter {
     return this.getLastFocusedWindow()
   }
 
-  addWindow(window: Electron.BrowserWindow) {
+  addWindow(window: Electron.BaseWindow) {
     if (this.windows.has(window)) return
 
     this.windows.add(window)
@@ -73,7 +73,7 @@ export class ExtensionStore extends EventEmitter {
     return win
   }
 
-  async removeWindow(window: Electron.BrowserWindow) {
+  async removeWindow(window: Electron.BaseWindow) {
     if (!this.windows.has(window)) return
 
     this.windows.delete(window)
@@ -89,7 +89,7 @@ export class ExtensionStore extends EventEmitter {
     return Array.from(this.tabs).find((tab) => !tab.isDestroyed() && tab.id === tabId)
   }
 
-  addTab(tab: Electron.WebContents, window: Electron.BrowserWindow) {
+  addTab(tab: Electron.WebContents, window: Electron.BaseWindow) {
     if (this.tabs.has(tab)) return
 
     this.tabs.add(tab)
@@ -157,7 +157,7 @@ export class ExtensionStore extends EventEmitter {
     return tab
   }
 
-  getActiveTabFromWindow(win: Electron.BrowserWindow) {
+  getActiveTabFromWindow(win: Electron.BaseWindow) {
     const activeTab = win && !win.isDestroyed() && this.windowToActiveTab.get(win)
     return (activeTab && !activeTab.isDestroyed() && activeTab) || undefined
   }