Remove trunk instances of MOZILLA_1_8_BRANCH interfaces. Bug 347910, r+sr+a=jst
git-svn-id: svn://10.0.0.236/trunk@237338 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -403,16 +403,30 @@ nsDocShellTreeOwner::RemoveFromWatcher()
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShellTreeOwner::ContentShellAdded(nsIDocShellTreeItem* aContentShell,
|
||||
PRBool aPrimary, const PRUnichar* aID)
|
||||
PRBool aPrimary, PRBool aTargetable,
|
||||
const nsAString& aID)
|
||||
{
|
||||
if(mTreeOwner)
|
||||
return mTreeOwner->ContentShellAdded(aContentShell, aPrimary, aID);
|
||||
return mTreeOwner->ContentShellAdded(aContentShell, aPrimary,
|
||||
aTargetable, aID);
|
||||
|
||||
if (aPrimary)
|
||||
mPrimaryContentShell = aContentShell;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShellTreeOwner::ContentShellRemoved(nsIDocShellTreeItem* aContentShell)
|
||||
{
|
||||
if(mTreeOwner)
|
||||
return mTreeOwner->ContentShellRemoved(aContentShell);
|
||||
|
||||
if(mPrimaryContentShell == aContentShell)
|
||||
mPrimaryContentShell = nsnull;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShellTreeOwner::GetPrimaryContentShell(nsIDocShellTreeItem** aShell)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user