summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-29 00:59:31 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-29 00:59:31 +0000
commit3f2b909c01efe578d66be408453be01fe932f430 (patch)
tree48183fa41ebff52b136aa4008128bf38f08cf92a
parentd4f499bce5375802bb1a10ebfc85587d0c3024c2 (diff)
downloadchromium_src-3f2b909c01efe578d66be408453be01fe932f430.zip
chromium_src-3f2b909c01efe578d66be408453be01fe932f430.tar.gz
chromium_src-3f2b909c01efe578d66be408453be01fe932f430.tar.bz2
Clarify licenses on a bunch of files.
In this process, I also filed bugs on various projects we depend on that also have unclear licenses. BUG=28291 Review URL: http://codereview.chromium.org/521009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35323 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--app/test/data/resource.h4
-rw-r--r--base/allocator/prep_libc.sh4
-rwxr-xr-xbuild/linux/rewrite_dirs.py3
-rw-r--r--courgette/memory_monitor.cc4
-rw-r--r--media/tools/player_wtl/resource.h4
-rw-r--r--net/third_party/nss/ssl/bodge/secure_memcmp.c36
-rw-r--r--views/examples/textfield_example.h2
-rw-r--r--webkit/appcache/appcache_group_unittest.cc2
-rw-r--r--webkit/appcache/appcache_host_unittest.cc2
-rw-r--r--webkit/appcache/appcache_request_handler_unittest.cc2
-rw-r--r--webkit/appcache/appcache_response_unittest.cc2
-rw-r--r--webkit/appcache/appcache_storage_unittest.cc2
-rw-r--r--webkit/appcache/appcache_update_job_unittest.cc2
-rw-r--r--webkit/appcache/appcache_url_request_job_unittest.cc2
-rw-r--r--webkit/appcache/manifest_parser_unittest.cc2
-rw-r--r--webkit/appcache/mock_appcache_storage_unittest.cc2
-rw-r--r--webkit/database/database_tracker_unittest.cc2
-rw-r--r--webkit/database/database_util_unittest.cc2
-rw-r--r--webkit/database/databases_table_unittest.cc2
-rw-r--r--webkit/glue/plugins/test/resource.h4
-rwxr-xr-xwebkit/tools/layout_tests/dedup-tests.py3
-rw-r--r--webkit/tools/test_shell/resource.h4
-rw-r--r--webkit/tools/test_shell/test_shell_x11.cc4
-rw-r--r--webkit/tools/test_shell/test_shell_x11.h4
24 files changed, 87 insertions, 13 deletions
diff --git a/app/test/data/resource.h b/app/test/data/resource.h
index 7008da4..9043b38 100644
--- a/app/test/data/resource.h
+++ b/app/test/data/resource.h
@@ -1,3 +1,7 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by resource.rc
diff --git a/base/allocator/prep_libc.sh b/base/allocator/prep_libc.sh
index 08d5acb..5edd2fe 100644
--- a/base/allocator/prep_libc.sh
+++ b/base/allocator/prep_libc.sh
@@ -1,4 +1,8 @@
#!/bin/sh
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
# This script takes libcmt.lib for VS2005 and removes the allocation related
# functions from it.
#
diff --git a/build/linux/rewrite_dirs.py b/build/linux/rewrite_dirs.py
index 9a00f96..bb37b24 100755
--- a/build/linux/rewrite_dirs.py
+++ b/build/linux/rewrite_dirs.py
@@ -1,4 +1,7 @@
#!/usr/bin/python
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Rewrites paths in -I, -L and other option to be relative to a sysroot."""
diff --git a/courgette/memory_monitor.cc b/courgette/memory_monitor.cc
index 51cb0cc..26ce81f 100644
--- a/courgette/memory_monitor.cc
+++ b/courgette/memory_monitor.cc
@@ -1,3 +1,7 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
#include <stdio.h>
#include <map>
diff --git a/media/tools/player_wtl/resource.h b/media/tools/player_wtl/resource.h
index 4c4b643..1f35447 100644
--- a/media/tools/player_wtl/resource.h
+++ b/media/tools/player_wtl/resource.h
@@ -1,3 +1,7 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by player_wtl.rc
diff --git a/net/third_party/nss/ssl/bodge/secure_memcmp.c b/net/third_party/nss/ssl/bodge/secure_memcmp.c
index c21e866..b18579c 100644
--- a/net/third_party/nss/ssl/bodge/secure_memcmp.c
+++ b/net/third_party/nss/ssl/bodge/secure_memcmp.c
@@ -1,3 +1,39 @@
+/* ***** 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 the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * 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 ***** */
+
// This file exists to provide the secure memcmp function. This was added in
// NSS 3.12.5.
diff --git a/views/examples/textfield_example.h b/views/examples/textfield_example.h
index 82b7b79..15aff6f 100644
--- a/views/examples/textfield_example.h
+++ b/views/examples/textfield_example.h
@@ -1,4 +1,4 @@
-// Copyight (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/appcache/appcache_group_unittest.cc b/webkit/appcache/appcache_group_unittest.cc
index 384a38b..5986021 100644
--- a/webkit/appcache/appcache_group_unittest.cc
+++ b/webkit/appcache/appcache_group_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/appcache/appcache_host_unittest.cc b/webkit/appcache/appcache_host_unittest.cc
index f726d9e..065ed7c 100644
--- a/webkit/appcache/appcache_host_unittest.cc
+++ b/webkit/appcache/appcache_host_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc
index c42efbb..7bbce32 100644
--- a/webkit/appcache/appcache_request_handler_unittest.cc
+++ b/webkit/appcache/appcache_request_handler_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/appcache/appcache_response_unittest.cc b/webkit/appcache/appcache_response_unittest.cc
index 1077b9b..824e73c 100644
--- a/webkit/appcache/appcache_response_unittest.cc
+++ b/webkit/appcache/appcache_response_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/appcache/appcache_storage_unittest.cc b/webkit/appcache/appcache_storage_unittest.cc
index c9c44d8..083d566 100644
--- a/webkit/appcache/appcache_storage_unittest.cc
+++ b/webkit/appcache/appcache_storage_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc
index bf368cd..4ed1224 100644
--- a/webkit/appcache/appcache_update_job_unittest.cc
+++ b/webkit/appcache/appcache_update_job_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc
index b7b452f..f999ad4 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/appcache/appcache_url_request_job_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/appcache/manifest_parser_unittest.cc b/webkit/appcache/manifest_parser_unittest.cc
index e3e0ead..45ccbdd 100644
--- a/webkit/appcache/manifest_parser_unittest.cc
+++ b/webkit/appcache/manifest_parser_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/appcache/mock_appcache_storage_unittest.cc b/webkit/appcache/mock_appcache_storage_unittest.cc
index 28e1bc5..521c967 100644
--- a/webkit/appcache/mock_appcache_storage_unittest.cc
+++ b/webkit/appcache/mock_appcache_storage_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/database/database_tracker_unittest.cc b/webkit/database/database_tracker_unittest.cc
index 0d0b635..cf9fb5d 100644
--- a/webkit/database/database_tracker_unittest.cc
+++ b/webkit/database/database_tracker_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/database/database_util_unittest.cc b/webkit/database/database_util_unittest.cc
index 87422a5..edcc25f 100644
--- a/webkit/database/database_util_unittest.cc
+++ b/webkit/database/database_util_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/database/databases_table_unittest.cc b/webkit/database/databases_table_unittest.cc
index 77e9427..fb46d08 100644
--- a/webkit/database/databases_table_unittest.cc
+++ b/webkit/database/databases_table_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/webkit/glue/plugins/test/resource.h b/webkit/glue/plugins/test/resource.h
index f9680f7..0d23ee9 100644
--- a/webkit/glue/plugins/test/resource.h
+++ b/webkit/glue/plugins/test/resource.h
@@ -1,3 +1,7 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by npapitest.rc
diff --git a/webkit/tools/layout_tests/dedup-tests.py b/webkit/tools/layout_tests/dedup-tests.py
index ea5de92..6e1f635 100755
--- a/webkit/tools/layout_tests/dedup-tests.py
+++ b/webkit/tools/layout_tests/dedup-tests.py
@@ -1,4 +1,7 @@
#!/usr/bin/python
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""dedup-tests -- print test results duplicated between win and linux.
diff --git a/webkit/tools/test_shell/resource.h b/webkit/tools/test_shell/resource.h
index ca853dd..68aa6a2 100644
--- a/webkit/tools/test_shell/resource.h
+++ b/webkit/tools/test_shell/resource.h
@@ -1,3 +1,7 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by test_shell.rc
diff --git a/webkit/tools/test_shell/test_shell_x11.cc b/webkit/tools/test_shell/test_shell_x11.cc
index 865954b..73f4ca3 100644
--- a/webkit/tools/test_shell/test_shell_x11.cc
+++ b/webkit/tools/test_shell/test_shell_x11.cc
@@ -1,3 +1,7 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
diff --git a/webkit/tools/test_shell/test_shell_x11.h b/webkit/tools/test_shell/test_shell_x11.h
index a17356d..d3e41dd 100644
--- a/webkit/tools/test_shell/test_shell_x11.h
+++ b/webkit/tools/test_shell/test_shell_x11.h
@@ -1,3 +1,7 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_X11_H
#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_X11_H