diff options
24 files changed, 69 insertions, 73 deletions
diff --git a/chrome/common/extensions/docs/examples/api/notifications/options.html b/chrome/common/extensions/docs/examples/api/notifications/options.html index 775a3a3..df61b37 100644 --- a/chrome/common/extensions/docs/examples/api/notifications/options.html +++ b/chrome/common/extensions/docs/examples/api/notifications/options.html @@ -1,12 +1,11 @@ <!-- - An option page for configuring notifications. - - Copyright 2010 the Chromium Authors - - Use of this source code is governed by a BSD-style license that can be found - in the "LICENSE" file. + Copyright (c) 2012 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. Brian Kennish <bkennish@chromium.org> + + An option page for configuring notifications. --> <!doctype html> <html> diff --git a/chrome/common/extensions/docs/examples/apps/hello-java/HelloLicenseServlet.java b/chrome/common/extensions/docs/examples/apps/hello-java/HelloLicenseServlet.java index 08ab4d72..45b7790 100644 --- a/chrome/common/extensions/docs/examples/apps/hello-java/HelloLicenseServlet.java +++ b/chrome/common/extensions/docs/examples/apps/hello-java/HelloLicenseServlet.java @@ -1,4 +1,8 @@ /* + * Copyright (c) 2012 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. + * * The "Hello world!" of the Chrome Web Store Licensing API, in Java. This * program logs the user in with OpenID, fetches their license state with OAuth, * and prints one of these greetings as appropriate: @@ -7,11 +11,6 @@ * 2. Hello *free trial* license! * 3. Hello *full* license! * - * Copyright 2010 the Chromium Authors - * - * Use of this source code is governed by a BSD-style license that can be found - * in the "LICENSE" file. - * * Brian Kennish <bkennish@chromium.org> */ package com.example; diff --git a/chrome/common/extensions/docs/examples/apps/hello-java/workspace/HelloLicense/src/com/example/HelloLicenseServlet.java b/chrome/common/extensions/docs/examples/apps/hello-java/workspace/HelloLicense/src/com/example/HelloLicenseServlet.java index 08ab4d72..45b7790 100644 --- a/chrome/common/extensions/docs/examples/apps/hello-java/workspace/HelloLicense/src/com/example/HelloLicenseServlet.java +++ b/chrome/common/extensions/docs/examples/apps/hello-java/workspace/HelloLicense/src/com/example/HelloLicenseServlet.java @@ -1,4 +1,8 @@ /* + * Copyright (c) 2012 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. + * * The "Hello world!" of the Chrome Web Store Licensing API, in Java. This * program logs the user in with OpenID, fetches their license state with OAuth, * and prints one of these greetings as appropriate: @@ -7,11 +11,6 @@ * 2. Hello *free trial* license! * 3. Hello *full* license! * - * Copyright 2010 the Chromium Authors - * - * Use of this source code is governed by a BSD-style license that can be found - * in the "LICENSE" file. - * * Brian Kennish <bkennish@chromium.org> */ package com.example; diff --git a/chrome/common/extensions/docs/examples/apps/hello-php/index.php b/chrome/common/extensions/docs/examples/apps/hello-php/index.php index f145776..8b0d3cf 100644 --- a/chrome/common/extensions/docs/examples/apps/hello-php/index.php +++ b/chrome/common/extensions/docs/examples/apps/hello-php/index.php @@ -1,5 +1,9 @@ <?php /** + * Copyright (c) 2012 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 "Hello world!" for the Chrome Web Store Licensing API, in PHP. This * program logs the user in with Google's Federated Login API (OpenID), fetches * their license state with OAuth, and prints one of these greetings as @@ -14,11 +18,6 @@ * to the login page, keeping the user on the main application page. See * popuplib.js * - * Copyright 2010 the Chromium Authors - * - * Use of this source code is governed by a BSD-style license that can be found - * in the "LICENSE" file. - * * Eric Bidelman <ericbidelman@chromium.org> */ diff --git a/native_client_sdk/src/build_tools/build_updater.py b/native_client_sdk/src/build_tools/build_updater.py index 3df0c39..efe610a 100755 --- a/native_client_sdk/src/build_tools/build_updater.py +++ b/native_client_sdk/src/build_tools/build_updater.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -# copyright (c) 2012 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. +# Copyright (c) 2012 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. """Build script to generate a new sdk_tools bundle. diff --git a/native_client_sdk/src/build_tools/tests/test_auto_update_sdktools.py b/native_client_sdk/src/build_tools/tests/test_auto_update_sdktools.py index 8165f48..2eee964 100755 --- a/native_client_sdk/src/build_tools/tests/test_auto_update_sdktools.py +++ b/native_client_sdk/src/build_tools/tests/test_auto_update_sdktools.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -# copyright (c) 2012 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. +# Copyright (c) 2012 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 os import re diff --git a/native_client_sdk/src/build_tools/tests/test_server.py b/native_client_sdk/src/build_tools/tests/test_server.py index bee9fc9..3fd791b 100644 --- a/native_client_sdk/src/build_tools/tests/test_server.py +++ b/native_client_sdk/src/build_tools/tests/test_server.py @@ -1,6 +1,6 @@ -# copyright (c) 2012 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. +# Copyright (c) 2012 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 multiprocessing import os diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_instance.h b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_instance.h index 137b137..ccfd25f 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_instance.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_instance.h @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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 NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_INSTANCE_H_ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_INSTANCE_H_ diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_instance.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_instance.h index 153761b..740a2b7 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_instance.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_instance.h @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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 NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_INSTANCE_H_ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_INSTANCE_H_ diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_loader.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_loader.h index b1417d73..a62cb9b 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_loader.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_loader.h @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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 NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_URL_LOADER_H_ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_URL_LOADER_H_ diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_request_info.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_request_info.h index e53fd3b..c80078c 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_request_info.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_request_info.h @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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 NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_URL_REQUEST_INFO_H_ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_URL_REQUEST_INFO_H_ diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_response_info.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_response_info.h index 5b938bd..66b08e8 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_response_info.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_url_response_info.h @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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 NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_URL_RESPONSE_INFO_H_ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_URL_RESPONSE_INFO_H_ diff --git a/ppapi/native_client/src/trusted/plugin/arch_arm/sandbox_isa.cc b/ppapi/native_client/src/trusted/plugin/arch_arm/sandbox_isa.cc index f72d0b3..01b8769 100644 --- a/ppapi/native_client/src/trusted/plugin/arch_arm/sandbox_isa.cc +++ b/ppapi/native_client/src/trusted/plugin/arch_arm/sandbox_isa.cc @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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 "native_client/src/trusted/plugin/nexe_arch.h" diff --git a/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc b/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc index 093cdb2..d9f9c0c 100644 --- a/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc +++ b/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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 "native_client/src/trusted/plugin/nexe_arch.h" #include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h" diff --git a/ppapi/native_client/src/trusted/plugin/dylib_unittest.cc b/ppapi/native_client/src/trusted/plugin/dylib_unittest.cc index 7790ac5..eff9816 100644 --- a/ppapi/native_client/src/trusted/plugin/dylib_unittest.cc +++ b/ppapi/native_client/src/trusted/plugin/dylib_unittest.cc @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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 "native_client/src/trusted/plugin/dylib_unittest.h" diff --git a/ppapi/native_client/src/trusted/plugin/dylib_unittest.h b/ppapi/native_client/src/trusted/plugin/dylib_unittest.h index df60b70..2c4f8a2c 100644 --- a/ppapi/native_client/src/trusted/plugin/dylib_unittest.h +++ b/ppapi/native_client/src/trusted/plugin/dylib_unittest.h @@ -1,6 +1,6 @@ -// Copyright 2010 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. +// Copyright (c) 2012 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. // Functions for dynamically loading the trusted plugin when running unit // tests. diff --git a/ppapi/native_client/src/trusted/plugin/nexe_arch.cc b/ppapi/native_client/src/trusted/plugin/nexe_arch.cc index 8c542e6..a33df0b 100644 --- a/ppapi/native_client/src/trusted/plugin/nexe_arch.cc +++ b/ppapi/native_client/src/trusted/plugin/nexe_arch.cc @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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 "native_client/src/trusted/plugin/nexe_arch.h" diff --git a/ppapi/native_client/src/trusted/plugin/nexe_arch.h b/ppapi/native_client/src/trusted/plugin/nexe_arch.h index f327e80..1a9bb2f 100644 --- a/ppapi/native_client/src/trusted/plugin/nexe_arch.h +++ b/ppapi/native_client/src/trusted/plugin/nexe_arch.h @@ -1,7 +1,7 @@ /* - * Copyright 2011 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. + * Copyright (c) 2012 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. */ // Routines for determining the most appropriate NaCl executable for diff --git a/ppapi/native_client/src/trusted/plugin/plugin_unittest.cc b/ppapi/native_client/src/trusted/plugin/plugin_unittest.cc index 4558a07..27e2c02 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin_unittest.cc +++ b/ppapi/native_client/src/trusted/plugin/plugin_unittest.cc @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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. // Unit tests for ppGoogleNaClPlugin diff --git a/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.html b/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.html index 71d3c49..1cf654c 100644 --- a/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.html +++ b/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.html @@ -1,5 +1,5 @@ <!-- - Copyright 2011 The Chromium Authors. All rights reserved. + Copyright (c) 2012 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/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.html b/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.html index c54a164..a256414 100644 --- a/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.html +++ b/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.html @@ -1,5 +1,5 @@ <!-- - Copyright 2011 The Chromium Authors. All rights reserved. + Copyright (c) 2012 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/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.html b/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.html index 05cee03..7a7b8d5 100644 --- a/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.html +++ b/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.html @@ -1,5 +1,5 @@ <!-- - Copyright 2011 The Chromium Authors. All rights reserved. + Copyright (c) 2012 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/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.cc b/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.cc index 5119629..e2209e4 100644 --- a/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.cc +++ b/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.cc @@ -1,6 +1,6 @@ -// Copyright 2011 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. +// Copyright (c) 2012 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 <cstdio> #include <cstdlib> diff --git a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html index 352b6d4..71dc99c 100644 --- a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html +++ b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html @@ -1,5 +1,5 @@ <!-- - Copyright 2011 The Chromium Authors. All rights reserved. + Copyright (c) 2012 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. --> |