diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 13:04:13 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 13:04:13 +0000 |
| commit | 5c022f213884ec4d03cedf6a5976dd8d754e8de9 (patch) | |
| tree | 66cd8daf4c9b4a72ddedb6c595980e3a7bcc8b02 /android_webview/tools | |
| parent | 889d2a379c8c6fe7be3662cc9f280f4008f1f3a8 (diff) | |
| download | chromium_src-5c022f213884ec4d03cedf6a5976dd8d754e8de9.zip chromium_src-5c022f213884ec4d03cedf6a5976dd8d754e8de9.tar.gz chromium_src-5c022f213884ec4d03cedf6a5976dd8d754e8de9.tar.bz2 | |
[Android WebView] Remove GURL whitelisting from third_party_files_whitelist
File licenses have been updated in https://codereview.chromium.org/14660005.
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/14851007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/tools')
| -rw-r--r-- | android_webview/tools/third_party_files_whitelist.txt | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt index 1f452e0..22c4c9a 100644 --- a/android_webview/tools/third_party_files_whitelist.txt +++ b/android_webview/tools/third_party_files_whitelist.txt @@ -171,42 +171,10 @@ ui/gfx/codec/jpeg_codec.cc # This third-party code is taken from Mozilla, but is copyright Google and has # been re-licensed under the Chromium license. ui/gfx/codec/png_codec.cc -# This stuff is the new location for GoogleURL. It is not currently used. -url/gurl.cc -url/gurl.h -url/gurl_test_main.cc -url/url_canon.h -url/url_canon_etc.cc -url/url_canon_filesystemurl.cc -url/url_canon_fileurl.cc -url/url_canon_host.cc -url/url_canon_icu.cc -url/url_canon_icu.h -url/url_canon_internal.cc -url/url_canon_internal.h -url/url_canon_internal_file.h -url/url_canon_ip.cc -url/url_canon_ip.h -url/url_canon_mailtourl.cc -url/url_canon_path.cc -url/url_canon_pathurl.cc -url/url_canon_query.cc -url/url_canon_relative.cc -url/url_canon_stdstring.h -url/url_canon_stdurl.cc -url/url_canon_unittest.cc -url/url_common.h -url/url_file.h +# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2 +# license. This third-party code is taken from Mozilla, the license for which +# we already pick up from third_party/npapi/. url/url_parse.cc -url/url_parse.h -url/url_parse_file.cc -url/url_parse_internal.h -url/url_parse_unittest.cc -url/url_test_utils.h -url/url_util.cc -url/url_util.h -url/url_util_internal.h -url/url_util_unittest.cc # Copyright The Chromium Authors and Apple Inc; BSD license. This third-party # code is taken from WebKit, the license for which we already pick up from # webkit/. |