Patching a focus problem on web shell windows when no content area is contained in

a XUL file.

xpfe/appshell/src/nsWebShellWindow.cpp

@@ -520,15 +520,20 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
         void* data;
         aEvent->widget->GetClientData(data);
         if (data) {
+          nsCOMPtr<nsIDOMWindow> domWindow;
           nsCOMPtr<nsIWebShell> contentShell;
           ((nsWebShellWindow *)data)->GetContentWebShell(getter_AddRefs(contentShell));
           if (contentShell) {
-            nsCOMPtr<nsIDOMWindow> domWindow;
+            
             if (NS_SUCCEEDED(((nsWebShellWindow *)data)->
                 ConvertWebShellToDOMWindow(contentShell, getter_AddRefs(domWindow)))) {
               domWindow->Focus();
             }
           }
+          else if (webShell && NS_SUCCEEDED(((nsWebShellWindow *)data)->
+                ConvertWebShellToDOMWindow(webShell, getter_AddRefs(domWindow)))) {
+              domWindow->Focus();
+          }
         }
       }
       default: