summaryrefslogtreecommitdiffstats
path: root/third_party/mozilla
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-15 18:13:16 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-15 18:13:16 +0000
commita8e972c9d706503b358b4f1bc6956eebe45c31d1 (patch)
tree5168896bc135875485e3a49780fbfeef028df8c7 /third_party/mozilla
parent217829dd9788ddfedb85ba33cbfa1b261e75e434 (diff)
downloadchromium_src-a8e972c9d706503b358b4f1bc6956eebe45c31d1.zip
chromium_src-a8e972c9d706503b358b4f1bc6956eebe45c31d1.tar.gz
chromium_src-a8e972c9d706503b358b4f1bc6956eebe45c31d1.tar.bz2
Fix README.chromium and add LICENSE for third_party/mozilla.
BUG=none TEST=src/tools/licenses.py should be happy Review URL: http://codereview.chromium.org/1599032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mozilla')
-rw-r--r--third_party/mozilla/LICENSE35
-rw-r--r--third_party/mozilla/README.chromium60
2 files changed, 51 insertions, 44 deletions
diff --git a/third_party/mozilla/LICENSE b/third_party/mozilla/LICENSE
new file mode 100644
index 0000000..961b0cf
--- /dev/null
+++ b/third_party/mozilla/LICENSE
@@ -0,0 +1,35 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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
+ * 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
+ * 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
+ * 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
+ * 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 terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
diff --git a/third_party/mozilla/README.chromium b/third_party/mozilla/README.chromium
index 12c22a3..ab83407 100644
--- a/third_party/mozilla/README.chromium
+++ b/third_party/mozilla/README.chromium
@@ -1,44 +1,16 @@
-This directory contains files needed for mozilla interfaces required
-for the new Java Plugin APIs.
-
-Definitions of frozen interfaces are copied from Gecko SDK
-http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.8.0.4/sdk/gecko-sdk-win32-msvc-1.8.0.4.zip
-
-nscore.h
-nsError.h
-nsID.h
-nsISupports.h
-nsISupportsBase.h
-nsrootidl.h
-prcpucfg.h
-prlong.h
-prtime.h
-prtypes.h
-xpcom-config.h
-
-The prtypes.h file was modified to include "base/basictypes.h" instead of
-mozilla's protypes.h to avoid type clashes.
-
-nsISupports.h was modified to remove inclusion of nsISupportsUtils.h to avoid
-pulling in unnecessary headers and definitions.
-
-Definitions of remaining interfaces are auto generated during compilation of
-Mozilla source code. For convenience, these are copied from:
-http://publicsvn.songbirdnest.com/browser/trunk/dependencies/win32/mozilla/debug/include/plugin?rev=1
-
-nsICookieStorage.h
-nsIPluginManager.h
-nsIPluginManager2.h
-nsplugindefs.h
-nspluginroot.h
-
-The following files come from mozilla/camino and are not part of the Gecko SDK:
-
-NSPasteboard+Utils.h/m
-NSScreen+Utils.h/m
-NSString+Utils.h/m
-NSURL+Utils.h/m
-NSWorkspace+Utils.h/m
-
-NSURL+Utils.m was modified to use non-deprecated Cocoa APIs to allow compilation
-on future versions of Mac OS X.
+Name: Cocoa extension code from Camino
+URL: http://caminobrowser.org/
+
+Description:
+ This directory contains the following files come from (Mozilla) Camino
+ (src/camino/src/extensions):
+
+ NSPasteboard+Utils.h/mm
+ NSScreen+Utils.h/m
+ NSString+Utils.h/m
+ NSURL+Utils.h/m
+ NSWorkspace+Utils.h/m
+
+Local modifications:
+ NSURL+Utils.m was modified to use non-deprecated Cocoa APIs to allow
+ compilation on future versions of Mac OS X.