I failed to merge this hunk correctly last time :-[ b=104532 r=danm sr=jst a=asa
git-svn-id: svn://10.0.0.236/trunk@169322 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
31dd35c4c2
commit
a551a71fb6
@ -359,6 +359,10 @@ nsContentTreeOwner::GetPersistence(PRBool* aPersistPosition,
|
||||
|
||||
NS_IMETHODIMP nsContentTreeOwner::SetStatus(PRUint32 aStatusType, const PRUnichar* aStatus)
|
||||
{
|
||||
// We only allow the status to be set from the primary content shell
|
||||
if (!mPrimary)
|
||||
return NS_OK;
|
||||
|
||||
nsCOMPtr<nsIXULBrowserWindow> xulBrowserWindow;
|
||||
mXULWindow->GetXULBrowserWindow(getter_AddRefs(xulBrowserWindow));
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user