Bug 994971: Don't export nsObserverService.h. r=bsmedberg

--HG-- extra : rebase_source : cd5aa136075086a10cfa03d937743d8a5471fd6c
dothq · Apr 14, 2014 · d001ae7 · d001ae7
1 parent 01c6429
commit d001ae7
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
@@ -229,6 +229,7 @@ LOCAL_INCLUDES += [
     '/layout/svg',
     '/layout/xul',
     '/netwerk/base/src',
+    '/xpcom/ds',
 ]
 
 if CONFIG['GNU_CC'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':

diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
@@ -124,6 +124,7 @@
 #include "nsILineBreaker.h"
 #include "nsILoadContext.h"
 #include "nsILoadGroup.h"
+#include "nsIMemoryReporter.h"
 #include "nsIMIMEService.h"
 #include "nsINode.h"
 #include "nsINodeInfo.h"

diff --git a/content/media/Latency.h b/content/media/Latency.h
@@ -13,7 +13,7 @@
 #include "nsIThread.h"
 #include "mozilla/Monitor.h"
 #include "nsISupportsImpl.h"
-#include "nsObserverService.h"
+#include "nsIObserver.h"
 
 class AsyncLatencyLogger;
 class LogEvent;

diff --git a/dom/camera/DOMCameraManager.cpp b/dom/camera/DOMCameraManager.cpp
@@ -9,7 +9,7 @@
 #include "nsPIDOMWindow.h"
 #include "mozilla/Services.h"
 #include "nsContentPermissionHelper.h"
-#include "nsObserverService.h"
+#include "nsIObserverService.h"
 #include "nsIPermissionManager.h"
 #include "DOMCameraControl.h"
 #include "nsDOMClassInfo.h"

diff --git a/dom/media/MediaManager.h b/dom/media/MediaManager.h
@@ -11,7 +11,7 @@
 #include "nsGlobalWindow.h"
 #include "nsClassHashtable.h"
 #include "nsRefPtrHashtable.h"
-#include "nsObserverService.h"
+#include "nsIObserver.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 

diff --git a/hal/HalWakeLock.cpp b/hal/HalWakeLock.cpp
@@ -12,7 +12,7 @@
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
 #include "nsIPropertyBag2.h"
-#include "nsObserverService.h"
+#include "nsIObserverService.h"
 
 using namespace mozilla;
 using namespace mozilla::hal;

diff --git a/hal/cocoa/CocoaBattery.cpp b/hal/cocoa/CocoaBattery.cpp
@@ -12,7 +12,8 @@
 #include <mozilla/dom/battery/Constants.h>
 #include <mozilla/Services.h>
 
-#include <nsObserverService.h>
+#include <nsIObserverService.h>
+#include <nsIObserver.h>
 
 #include <dlfcn.h>
 

diff --git a/xpcom/ds/moz.build b/xpcom/ds/moz.build
@@ -53,8 +53,6 @@ EXPORTS += [
     'nsHashPropertyBag.h',
     'nsHashtable.h',
     'nsMathUtils.h',
-    'nsObserverList.h',
-    'nsObserverService.h',
     'nsStaticAtom.h',
     'nsStaticNameTable.h',
     'nsStringEnumerator.h',