Bug 1466673 part 4. Stop using nsITreeColumns in various other C++ code. r=mossop

layout/base/PresShell.cpp

@@ -8367,8 +8367,7 @@ PresShell::GetCurrentItemAndPositionForElement(Element* aFocusedElement,
           RefPtr<nsTreeColumns> cols;
           treeBox->GetColumns(getter_AddRefs(cols));
           if (cols) {
-            nsCOMPtr<nsITreeColumn> col;
-            cols->GetFirstColumn(getter_AddRefs(col));
+            nsTreeColumn* col = cols->GetFirstColumn();
             if (col) {
               RefPtr<Element> colElement;
               col->GetElement(getter_AddRefs(colElement));

layout/xul/nsXULTooltipListener.cpp

@@ -23,6 +23,7 @@
 #endif
 #include "nsIRootBox.h"
 #include "nsIBoxObject.h"
+#include "nsTreeColumns.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/LookAndFeel.h"

layout/xul/nsXULTooltipListener.h

@@ -13,12 +13,12 @@
 #include "nsString.h"
 #ifdef MOZ_XUL
 #include "nsITreeBoxObject.h"
-#include "nsITreeColumns.h"
 #endif
 #include "nsWeakPtr.h"
 #include "mozilla/Attributes.h"
 
 class nsIContent;
+class nsITreeColumn;
 
 namespace mozilla {
 namespace dom {

layout/xul/tree/nsTreeImageListener.cpp

@@ -9,6 +9,7 @@
 #include "imgIRequest.h"
 #include "imgIContainer.h"
 #include "nsIContent.h"
+#include "nsTreeColumns.h"
 
 NS_IMPL_ISUPPORTS(nsTreeImageListener, imgINotificationObserver)
 

layout/xul/tree/nsTreeImageListener.h

@@ -9,10 +9,11 @@
 
 #include "nsString.h"
 #include "nsCOMPtr.h"
-#include "nsITreeColumns.h"
 #include "nsTreeBodyFrame.h"
 #include "mozilla/Attributes.h"
 
+class nsITreeColumn;
+
 // This class handles image load observation.
 class nsTreeImageListener final : public imgINotificationObserver
 {

layout/xul/tree/nsTreeSelection.cpp

@@ -16,6 +16,7 @@
 #include "nsNameSpaceManager.h"
 #include "nsGkAtoms.h"
 #include "nsComponentManagerUtils.h"
+#include "nsTreeColumns.h"
 
 using namespace mozilla;
 

layout/xul/tree/nsTreeSelection.h

@@ -8,12 +8,12 @@
 #define nsTreeSelection_h__
 
 #include "nsITreeSelection.h"
-#include "nsITreeColumns.h"
 #include "nsITimer.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Attributes.h"
 
 class nsITreeBoxObject;
+class nsITreeColumn;
 struct nsTreeRange;
 
 class nsTreeSelection final : public nsINativeTreeSelection

security/manager/ssl/nsCertTree.cpp

@@ -10,7 +10,6 @@
 #include "nsArrayUtils.h"
 #include "nsHashKeys.h"
 #include "nsISupportsPrimitives.h"
-#include "nsITreeColumns.h"
 #include "nsIX509CertDB.h"
 #include "nsIX509Cert.h"
 #include "nsIX509CertValidity.h"
@@ -23,6 +22,7 @@
 #include "nsUnicharUtils.h"
 #include "nsXPCOMCID.h"
 #include "nsString.h"
+#include "nsTreeColumns.h"
 #include "pkix/pkixtypes.h"
 
 using namespace mozilla;