summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-28 16:41:51 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-28 16:41:51 +0000
commitfe1aceb5d5d27cded352616bf47379fe4afa50b6 (patch)
tree09d5e28d2c6d36a513c47201b27738b6c99ae151
parentc063b4893b50c2bb759ca5409b242de5caab7066 (diff)
downloadchromium_src-fe1aceb5d5d27cded352616bf47379fe4afa50b6.zip
chromium_src-fe1aceb5d5d27cded352616bf47379fe4afa50b6.tar.gz
chromium_src-fe1aceb5d5d27cded352616bf47379fe4afa50b6.tar.bz2
Add some licensing comments under chrome/.
BUG=28291 Review URL: http://codereview.chromium.org/507067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35301 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/chrome_dll_resource.h4
-rw-r--r--chrome/app/chrome_exe_resource.h4
-rw-r--r--chrome/installer/gcapi/resource.h4
-rw-r--r--chrome/installer/mini_installer/mini_installer_resource.h4
-rw-r--r--chrome/installer/setup/setup_resource.h4
-rw-r--r--chrome/installer/util/installer_util_unittests_resource.h4
-rwxr-xr-xchrome/installer/util/prebuild/create_string_rc.py4
-rw-r--r--chrome/test/data/dromaeo/README.chromium4
-rwxr-xr-xchrome/test/data/safe_browsing/download_update.py3
-rw-r--r--chrome/third_party/jstemplate/README.chromium2
-rwxr-xr-xchrome/third_party/jstemplate/compile.py3
-rwxr-xr-xchrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py5
-rwxr-xr-xchrome/tools/extract_actions.py4
-rwxr-xr-xchrome/tools/extract_histograms.py4
-rwxr-xr-xchrome/tools/history-viz.py5
-rw-r--r--chrome/tools/profiles/thumbnail-inl.h6
16 files changed, 54 insertions, 10 deletions
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index 9e5ec4b..df8ed80 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_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}}
//
// What began as a Microsoft Visual C++ generated include file is now
diff --git a/chrome/app/chrome_exe_resource.h b/chrome/app/chrome_exe_resource.h
index 9dcb2ae..53e48dd 100644
--- a/chrome/app/chrome_exe_resource.h
+++ b/chrome/app/chrome_exe_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 chrome_exe.rc
diff --git a/chrome/installer/gcapi/resource.h b/chrome/installer/gcapi/resource.h
index 3b9f419..45d46cb 100644
--- a/chrome/installer/gcapi/resource.h
+++ b/chrome/installer/gcapi/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 gcapi_test.rc
diff --git a/chrome/installer/mini_installer/mini_installer_resource.h b/chrome/installer/mini_installer/mini_installer_resource.h
index ca01e39..1ac4b2b 100644
--- a/chrome/installer/mini_installer/mini_installer_resource.h
+++ b/chrome/installer/mini_installer/mini_installer_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 mini_installer.rc
diff --git a/chrome/installer/setup/setup_resource.h b/chrome/installer/setup/setup_resource.h
index 7a24c58..93f8264 100644
--- a/chrome/installer/setup/setup_resource.h
+++ b/chrome/installer/setup/setup_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 setup.rc
diff --git a/chrome/installer/util/installer_util_unittests_resource.h b/chrome/installer/util/installer_util_unittests_resource.h
index b976fda..89f6f89 100644
--- a/chrome/installer/util/installer_util_unittests_resource.h
+++ b/chrome/installer/util/installer_util_unittests_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 installer_util_unittests.rc
diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py
index b573b4f..c3086f6 100755
--- a/chrome/installer/util/prebuild/create_string_rc.py
+++ b/chrome/installer/util/prebuild/create_string_rc.py
@@ -1,5 +1,7 @@
#!/usr/bin/python
-# Copyright 2009 Google Inc. 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.
"""This script generates an rc file and header (setup_strings.{rc,h}) to be
included in setup.exe. The rc file includes translations for strings pulled
diff --git a/chrome/test/data/dromaeo/README.chromium b/chrome/test/data/dromaeo/README.chromium
index 1adda18..8f036bf 100644
--- a/chrome/test/data/dromaeo/README.chromium
+++ b/chrome/test/data/dromaeo/README.chromium
@@ -6,8 +6,8 @@ This benchmark was slightly modified to enable Chromium automation.
How to update:
-0) remove all the files from this dir, but keep README.chromium
+0) remove all the files from this dir, but keep README.chromium and LICENSE
1) pull new version from git://github.com/antonm/dromaeo.git into a separate
directory;
2) run 'make web' to build standalone version;
-4) copy all the files from web dir into this directory.
+3) copy all the files from web dir into this directory.
diff --git a/chrome/test/data/safe_browsing/download_update.py b/chrome/test/data/safe_browsing/download_update.py
index bef5c6d..717025c 100755
--- a/chrome/test/data/safe_browsing/download_update.py
+++ b/chrome/test/data/safe_browsing/download_update.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.
import urllib,sys
diff --git a/chrome/third_party/jstemplate/README.chromium b/chrome/third_party/jstemplate/README.chromium
index 40ecdb4..51e0db5 100644
--- a/chrome/third_party/jstemplate/README.chromium
+++ b/chrome/third_party/jstemplate/README.chromium
@@ -9,7 +9,7 @@ This is a branch of http://code.google.com/p/google-jstemplate/
Uncalled functions have been removed from util.js to make the resulting
javascript smaller.
-compile.sh is a simple shell script used to generate the single compiled
+compile.py is a simple program used to generate the single compiled
jsfile.
jstemplate_compiled.js is the output after passing the code through
diff --git a/chrome/third_party/jstemplate/compile.py b/chrome/third_party/jstemplate/compile.py
index 3f9d5a7..3d16d96 100755
--- a/chrome/third_party/jstemplate/compile.py
+++ b/chrome/third_party/jstemplate/compile.py
@@ -1,4 +1,7 @@
#!/usr/bin/env 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.
# A python script that combines the javascript files needed by jstemplate into
# a single file.
diff --git a/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py b/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py
index 4c335e6..18ed95d 100755
--- a/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py
+++ b/chrome/tools/automated_ui_test_tools/auto_ui_test_input_generator.py
@@ -1,6 +1,7 @@
#!/usr/bin/python
-#
-# Copyright 2008 Google Inc. 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.
"""This generates the input file for automated_ui_tests.exe.
diff --git a/chrome/tools/extract_actions.py b/chrome/tools/extract_actions.py
index 6381976..8b6a9bf 100755
--- a/chrome/tools/extract_actions.py
+++ b/chrome/tools/extract_actions.py
@@ -1,5 +1,7 @@
#!/usr/bin/python
-# Copyright 2007 Google Inc. 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.
"""Extract UserMetrics "actions" strings from the Chrome source.
diff --git a/chrome/tools/extract_histograms.py b/chrome/tools/extract_histograms.py
index 97008a2..8c002f3 100755
--- a/chrome/tools/extract_histograms.py
+++ b/chrome/tools/extract_histograms.py
@@ -1,5 +1,7 @@
#!/usr/bin/python
-# Copyright 2007 Google Inc. 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.
"""Extract UMA histogram strings from the Chrome source.
diff --git a/chrome/tools/history-viz.py b/chrome/tools/history-viz.py
index ecceee4..6f82126 100755
--- a/chrome/tools/history-viz.py
+++ b/chrome/tools/history-viz.py
@@ -1,6 +1,7 @@
#!/usr/bin/python
-#
-# Copyright 2008 Google Inc. 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.
"""Process a History database and dump a .dot file suitable for GraphViz.
diff --git a/chrome/tools/profiles/thumbnail-inl.h b/chrome/tools/profiles/thumbnail-inl.h
index 7f3fba3..7632c84 100644
--- a/chrome/tools/profiles/thumbnail-inl.h
+++ b/chrome/tools/profiles/thumbnail-inl.h
@@ -1,3 +1,9 @@
+// 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.
+
+// A screenshot of the Google homepage; used as a thumbnail for autogenerated
+// testing profiles.
const unsigned char kGoogleThumbnail[] =
"\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x00\x00\x01\x00\x01\x00"
"\x00\xff\xdb\x00\x43\x00\x03\x02\x02\x03\x02\x02\x03\x03\x03\x03\x04\x03\x03"