From 2d91ea67cffee2bfc6e2547bcfdf698893a82212 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com"
 <blakeross%telocity.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 13 Oct 2002 16:43:29 +0000
Subject: [PATCH] Remove some stringbundles we no longer use.

git-svn-id: svn://10.0.0.236/trunk@131912 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser.js  | 42 ++++++++++++++++++++++++
 mozilla/browser/base/content/browser.xul |  3 --
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index cc438259827..352de170a89 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -4505,4 +4505,46 @@ function charsetLoadListener (event)
     }
 }
 
+/*
+ * Note that most of this routine has been moved into C++ in order to
+ * be available for all <browser> tags as well as gecko embedding. See
+ * mozilla/content/base/src/nsContentAreaDragDrop.cpp.
+ *
+ * Do not add any new fuctionality here other than what is needed for
+ * a standalone product.
+ */
+
+var contentAreaDNDObserver = {
+  onDrop: function (aEvent, aXferData, aDragSession)
+    {
+      var url = transferUtils.retrieveURLFromData(aXferData.data, aXferData.flavour.contentType);
+
+      // valid urls don't contain spaces ' '; if we have a space it isn't a valid url so bail out
+      if (!url || !url.length || url.indexOf(" ", 0) != -1) 
+        return;
+
+      switch (document.firstChild.getAttribute('windowtype')) {
+        case "navigator:browser":
+          loadURI(getShortcutOrURI(url));
+          break;
+        case "navigator:view-source":
+          viewSource(url);
+          break;
+      }
+      
+      // keep the event from being handled by the dragDrop listeners
+      // built-in to gecko if they happen to be above us.    
+      aEvent.preventDefault();
+    },
+
+  getSupportedFlavours: function ()
+    {
+      var flavourSet = new FlavourSet();
+      flavourSet.appendFlavour("text/x-moz-url");
+      flavourSet.appendFlavour("text/unicode");
+      flavourSet.appendFlavour("application/x-moz-file", "nsIFile");
+      return flavourSet;
+    }
+  
+};
 
diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index 8342c0124b6..0dbef59aaeb 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -55,7 +55,6 @@
   <script type="application/x-javascript" src="chrome://global/content/nsClipboard.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
@@ -65,9 +64,7 @@
  
   <stringbundleset id="stringbundleset"> <!-- Overlay hook for 3rd parties. Don't remove. -->
     <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
     <stringbundle id="bundle_browser_region" src="chrome://navigator-region/locale/region.properties"/>
-    <stringbundle id="bundle_brand_region" src="chrome://global-region/locale/region.properties"/>
     <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
     <stringbundle id="contentAreaBundle" src="chrome://communicator/locale/contentAreaCommands.properties"/>
   </stringbundleset>