diff --git a/mozilla/widget/src/gtk2/nsWindow.cpp b/mozilla/widget/src/gtk2/nsWindow.cpp
index b087e9d600b..1d4693520c9 100644
--- a/mozilla/widget/src/gtk2/nsWindow.cpp
+++ b/mozilla/widget/src/gtk2/nsWindow.cpp
@@ -4041,10 +4041,10 @@ nsWindow::MakeFullScreen(PRBool aFullScreen)
         gdk_window_fullscreen (mShell->window);
     else
         gdk_window_unfullscreen (mShell->window);
+    return NS_OK;
 #else
-    HideWindowChrome(aFullScreen);
+    return nsBaseWidget::MakeFullScreen(aFullScreen);
 #endif
-    return MakeFullScreenInternal(aFullScreen);
 }
 
 NS_IMETHODIMP
diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
index 244a2da9d2d..5a96e2a81ca 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -561,11 +561,7 @@ NS_IMETHODIMP nsBaseWidget::HideWindowChrome(PRBool aShouldHide)
 NS_IMETHODIMP nsBaseWidget::MakeFullScreen(PRBool aFullScreen)
 {
   HideWindowChrome(aFullScreen);
-  return MakeFullScreenInternal(aFullScreen);
-}
 
-nsresult nsBaseWidget::MakeFullScreenInternal(PRBool aFullScreen)
-{
   nsCOMPtr<nsIFullScreen> fullScreen = do_GetService("@mozilla.org/browser/fullscreen;1");
 
   if (aFullScreen) {
diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.h b/mozilla/widget/src/xpwidgets/nsBaseWidget.h
index 1a8e0ad0253..6aa102101a5 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseWidget.h
+++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.h
@@ -107,7 +107,6 @@ public:
   NS_IMETHOD              GetHasTransparentBackground(PRBool& aTransparent);
   NS_IMETHOD              HideWindowChrome(PRBool aShouldHide);
   NS_IMETHOD              MakeFullScreen(PRBool aFullScreen);
-  nsresult                MakeFullScreenInternal(PRBool aFullScreen);
   virtual nsIRenderingContext* GetRenderingContext();
   virtual nsIDeviceContext* GetDeviceContext();
   virtual nsIToolkit*     GetToolkit();