From 8f2c4e9f834aa4309e3e2935cb9c45ad3f7182e0 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Wed, 14 Aug 2013 13:19:08 +0200
Subject: [PATCH] Bug 904536 - Remove nsNativeWidget.h. r=roc

---
 widget/moz.build        |  1 -
 widget/nsIWidget.h      |  6 +++++-
 widget/nsNativeWidget.h | 14 --------------
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 widget/nsNativeWidget.h

diff --git a/widget/moz.build b/widget/moz.build
index e0fd3545bd3a..7c5b22362f62 100644
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -107,7 +107,6 @@ EXPORTS += [
     'nsIRollupListener.h',
     'nsIWidget.h',
     'nsIWidgetListener.h',
-    'nsNativeWidget.h',
     'nsWidgetInitData.h',
     'nsWidgetsCID.h',
 ]
diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
index 59ab15424441..f9520b21fbba 100644
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -14,7 +14,6 @@
 #include "nsEvent.h"
 #include "nsCOMPtr.h"
 #include "nsITheme.h"
-#include "nsNativeWidget.h"
 #include "nsWidgetInitData.h"
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
@@ -62,6 +61,11 @@ class DrawTarget;
  */
 typedef nsEventStatus (* EVENT_CALLBACK)(nsGUIEvent *event);
 
+// Hide the native window system's real window type so as to avoid
+// including native window system types and APIs. This is necessary
+// to ensure cross-platform code.
+typedef void* nsNativeWidget;
+
 /**
  * Flags for the getNativeData function.
  * See getNativeData()
diff --git a/widget/nsNativeWidget.h b/widget/nsNativeWidget.h
deleted file mode 100644
index 0003e3ab8e08..000000000000
--- a/widget/nsNativeWidget.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsNativeWidget_h__
-#define nsNativeWidget_h__
-
-// Hide the native window systems real window type so as to avoid
-// including native window system types and APIs. This is necessary
-// to ensure cross-platform code.
-typedef void* nsNativeWidget;
-
-#endif // nsNativeWidget_h__