Bug 408316: The license header of browser-places.js is not preprocessed and ends up in the middle of browser.js. r+a1.9=mconnor

browser/base/content/browser-places.js

@@ -1,42 +1,41 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+# ***** BEGIN LICENSE BLOCK *****
-/* ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
- *
+# The contents of this file are subject to the Mozilla Public License Version
- * The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
- * 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
- * the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
- * http://www.mozilla.org/MPL/
+#
- *
+# Software distributed under the License is distributed on an "AS IS" basis,
- * Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
- * for the specific language governing rights and limitations under the
+# License.
- * License.
+#
- *
+# The Original Code is the Places Browser Integration
- * The Original Code is the Places Browser Integration
+#
- *
+# The Initial Developer of the Original Code is Google Inc.
- * The Initial Developer of the Original Code is Google Inc.
+# Portions created by the Initial Developer are Copyright (C) 2006
- * Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
- * the Initial Developer. All Rights Reserved.
+#
- *
+# Contributor(s):
- * Contributor(s):
+#   Ben Goodger <beng@google.com>
- *   Ben Goodger <beng@google.com>
+#   Annie Sullivan <annie.sullivan@gmail.com>
- *   Annie Sullivan <annie.sullivan@gmail.com>
+#   Joe Hughes <joe@retrovirus.com>
- *   Joe Hughes <joe@retrovirus.com>
+#   Asaf Romano <mano@mozilla.com>
- *   Asaf Romano <mano@mozilla.com>
+#
- *
+# Alternatively, the contents of this file may be used under the terms of
- * Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
- * either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
- * in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
- * of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
- * under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
- * use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
- * decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
- * and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
- * the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
- * the terms of any one of the MPL, the GPL or the LGPL.
+#
- *
+# ***** END LICENSE BLOCK *****
- * ***** END LICENSE BLOCK ***** */
 
 var PlacesCommandHook = {
   // nsISupports