Don't include private js header files; fix gcc warnings.

embedding/components/windowwatcher/src/nsWindowWatcher.cpp

@@ -40,7 +40,6 @@
 
 #include "nsWindowWatcher.h"
 
-#include "jscntxt.h"
 #include "nsAutoLock.h"
 #include "nsCRT.h"
 #include "nsNetUtil.h"
@@ -1523,13 +1522,13 @@ nsWindowWatcher::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
   PRBool sizeChrome = PR_FALSE;
   PRBool sizeSpecified = PR_FALSE;
 
-  if (temp = WinHasOption(aFeatures, "outerWidth", chromeCX, nsnull)) {
+  if ((temp = WinHasOption(aFeatures, "outerWidth", chromeCX, nsnull))) {
     chromeCX = temp;
     sizeChrome = PR_TRUE;
     sizeSpecified = PR_TRUE;
   }
 
-  if (temp = WinHasOption(aFeatures, "outerHeight", chromeCY, nsnull)) {
+  if ((temp = WinHasOption(aFeatures, "outerHeight", chromeCY, nsnull))) {
     chromeCY = temp;
     sizeChrome = PR_TRUE;
     sizeSpecified = PR_TRUE;
@@ -1537,18 +1536,18 @@ nsWindowWatcher::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
 
   // We haven't switched to chrome sizing so we need to get the content area
   if (!sizeChrome) {
-    if (temp = WinHasOption(aFeatures, "width", chromeCX, nsnull)) {
+    if ((temp = WinHasOption(aFeatures, "width", chromeCX, nsnull))) {
       contentCX = temp;
       sizeSpecified = PR_TRUE;
-    } else if (temp = WinHasOption(aFeatures, "innerWidth", chromeCX, nsnull)) {
+    } else if ((temp = WinHasOption(aFeatures, "innerWidth", chromeCX, nsnull))) {
       contentCX = temp;
       sizeSpecified = PR_TRUE;
     }
 
-    if (temp = WinHasOption(aFeatures, "height", chromeCY, nsnull)) {
+    if ((temp = WinHasOption(aFeatures, "height", chromeCY, nsnull))) {
       contentCY = temp;
       sizeSpecified = PR_TRUE;
-    } else if (temp = WinHasOption(aFeatures, "innerHeight", chromeCY, nsnull)) {
+    } else if ((temp = WinHasOption(aFeatures, "innerHeight", chromeCY, nsnull))) {
       contentCY = temp;
       sizeSpecified = PR_TRUE;
     }