Removing //#define NEW_CLIPBOARD_SUPPORT

layout/base/nsPresShell.cpp

@@ -68,10 +68,6 @@
 
 #include "nsIDataFlavor.h"
 
-// XXX This is just a temporary thing until 
-//the new Clipboard support comes on line
-//#define NEW_CLIPBOARD_SUPPORT
-
 #ifdef NEW_CLIPBOARD_SUPPORT
 // Drag & Drop, Clipboard
 #include "nsWidgetsCID.h"

layout/html/base/src/nsPresShell.cpp

@@ -68,10 +68,6 @@
 
 #include "nsIDataFlavor.h"
 
-// XXX This is just a temporary thing until 
-//the new Clipboard support comes on line
-//#define NEW_CLIPBOARD_SUPPORT
-
 #ifdef NEW_CLIPBOARD_SUPPORT
 // Drag & Drop, Clipboard
 #include "nsWidgetsCID.h"

webshell/tests/viewer/nsSetupRegistry.cpp

@@ -212,8 +212,6 @@ static NS_DEFINE_IID(kObserverCID, NS_OBSERVER_CID);
 static NS_DEFINE_IID(kProfileCID, NS_PROFILE_CID);
 #endif
 
-//#define NEW_CLIPBOARD_SUPPORT
-
 #ifdef NEW_CLIPBOARD_SUPPORT
 static NS_DEFINE_IID(kClipboardCID,          NS_CLIPBOARD_CID);
 static NS_DEFINE_IID(kTransferableCID,       NS_TRANSFERABLE_CID);

xpfe/AppCores/src/nsBrowserAppCore.cpp

@@ -1349,9 +1349,6 @@ nsBrowserAppCore::PrintPreview()
 NS_IMETHODIMP    
 nsBrowserAppCore::Copy()
 { 
-  
-//#define NEW_CLIPBOARD_SUPPORT
-
 #ifdef NEW_CLIPBOARD_SUPPORT
   nsIPresShell * presShell = GetPresShellFor(mContentAreaWebShell);
   if (nsnull != presShell) {