Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Merge pull request #12917 from brave/auto-discard-disable
Browse files Browse the repository at this point in the history
Temporarily disable autodiscardable tabs
  • Loading branch information
bbondy authored Jan 30, 2018
2 parents d61d601 + b25da1a commit d00d99c
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions app/browser/tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const tabState = require('../common/state/tabState')
const {app, BrowserWindow, extensions, session, ipcMain} = require('electron')
const {makeImmutable, makeJS} = require('../common/state/immutableUtil')
const {getTargetAboutUrl, getSourceAboutUrl, isSourceAboutUrl, newFrameUrl, isTargetAboutUrl, isIntermediateAboutPage, isTargetMagnetUrl, getSourceMagnetUrl} = require('../../js/lib/appUrlUtil')
const {isURL, getUrlFromInput, toPDFJSLocation, getDefaultFaviconUrl, isHttpOrHttps, getLocationIfPDF} = require('../../js/lib/urlutil')
const {isURL, getUrlFromInput, toPDFJSLocation, getDefaultFaviconUrl, getLocationIfPDF} = require('../../js/lib/urlutil')
const {isSessionPartition} = require('../../js/state/frameStateUtil')
const {getOrigin} = require('../../js/lib/urlutil')
const settingsStore = require('../../js/settings')
Expand Down Expand Up @@ -113,11 +113,9 @@ const needsPartitionAssigned = (createProperties) => {
}

const isAutoDiscardable = (createProperties) => {
if (createProperties.pinned) {
return false
}

return isHttpOrHttps(createProperties.url)
// Temporarily disabled due to bad handling for auto discarded tabs
// See https://github.com/brave/browser-laptop/issues/10673
return false
}

const aboutTabs = {}
Expand Down

0 comments on commit d00d99c

Please sign in to comment.