rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into sdk-mamoth-breakage

Browse source
This commit is contained in:
Jonathan Kingston 2017-08-04 18:21:48 +01:00
commit 4dfffb8c34
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
index.js
View file

@ -519,6 +519,8 @@ const ContainerService = {
// Let's forget all the previous closed tabs. // Let's forget all the previous closed tabs.
this._forgetIdentity(); this._forgetIdentity();
this._resetContainerToCentralIcons();
const preInstalledIdentities = data.preInstalledIdentities; const preInstalledIdentities = data.preInstalledIdentities;
ContextualIdentityProxy.getIdentities().forEach(identity => { ContextualIdentityProxy.getIdentities().forEach(identity => {
if (!preInstalledIdentities.includes(identity.userContextId)) { if (!preInstalledIdentities.includes(identity.userContextId)) {
@ -813,8 +815,6 @@ ContainerWindow.prototype = {
this._shutdownFileMenu(); this._shutdownFileMenu();
this._shutdownAllTabsMenu(); this._shutdownAllTabsMenu();
this._shutdownContextMenu(); this._shutdownContextMenu();
this._shutdownContainers();
}, },
_shutDownPlusButtonMenuElement(buttonElement) { _shutDownPlusButtonMenuElement(buttonElement) {
@ -877,7 +877,7 @@ ContainerWindow.prototype = {
return true; return true;
}, },
_shutdownContainers() { _resetContainerToCentralIcons() {
ContextualIdentityProxy.getIdentities().forEach(identity => { ContextualIdentityProxy.getIdentities().forEach(identity => {
if (IDENTITY_ICONS_STANDARD.indexOf(identity.icon) !== -1 && if (IDENTITY_ICONS_STANDARD.indexOf(identity.icon) !== -1 &&
IDENTITY_COLORS_STANDARD.indexOf(identity.color) !== -1) { IDENTITY_COLORS_STANDARD.indexOf(identity.color) !== -1) {