From 09c35fcab1ef0b3ffc33a8e69c918334e624a9d9 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Tue, 29 Nov 2005 05:59:38 +0000 Subject: [PATCH] Fix camino build bustage (bug 316794). git-svn-id: svn://10.0.0.236/trunk@185367 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/src/embedding/CHBrowserView.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/camino/src/embedding/CHBrowserView.mm b/mozilla/camino/src/embedding/CHBrowserView.mm index efffd319397..4e1a1e3b852 100644 --- a/mozilla/camino/src/embedding/CHBrowserView.mm +++ b/mozilla/camino/src/embedding/CHBrowserView.mm @@ -63,7 +63,7 @@ #include "nsIPrintSettingsService.h" // bigger/smaller text -#include "nsIScriptGlobalObject.h" +#include "nsPIDOMWindow.h" #include "nsIDocShell.h" #include "nsIMarkupDocumentViewer.h" #include "nsIContentViewer.h" @@ -1102,10 +1102,10 @@ const long NSFindPanelActionSetFindString = 7; return NULL; nsCOMPtr domWindow; _webBrowser->GetContentDOMWindow(getter_AddRefs(domWindow)); - nsCOMPtr global(do_QueryInterface(domWindow)); - if (!global) + nsCOMPtr privWin(do_QueryInterface(domWindow)); + if (!privWin) return NULL; - return global->GetDocShell(); + return privWin->GetDocShell(); } - (id)getBrowserContainer