summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-16 21:57:52 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-16 21:57:52 +0000
commit946b4ee048350f35983771dfa928863d2af7177b (patch)
tree52343cf4354c6e675829b23f01ae5b4183d3349b /android_webview
parent23deabb766b17dbce4cfa44b7dac8c858d0a3ad7 (diff)
downloadchromium_src-946b4ee048350f35983771dfa928863d2af7177b.zip
chromium_src-946b4ee048350f35983771dfa928863d2af7177b.tar.gz
chromium_src-946b4ee048350f35983771dfa928863d2af7177b.tar.bz2
Move most importer code to chrome/utility/importer
Moves the out-of-process parts from chrome/browser/importer into chrome/utility/importer. The majority here are simple moves, mostly into chrome/utility/importer and a few into chrome/common/importer. A few places required splitting files up to put some in different parts of browser|common|utility. These were: - chrome/browser/favicon ReencodeFavicon -> utility (it depends on Blink, so should only be in child processes) - history::VisitSource as used by ImporterBridge -> new similar enum in importer_data_types that's remapped once it's in the browser process - LogImporterUseToMetrics split out to importer_uma in browser. Adds chrome/utility/importer/OWNERS identical to chrome/browser/importer. Existing DEPS disallows both utility->browser and browser->utility. TBR=gab@chromium.org, jam@chromium.org, joth@chromium.org, jschuh@chromium.org, thestig@chromium.org BUG=254672,237249 Review URL: https://codereview.chromium.org/18501013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/tools/third_party_files_whitelist.txt28
1 files changed, 14 insertions, 14 deletions
diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt
index 3c7cc0a..bc5ad88 100644
--- a/android_webview/tools/third_party_files_whitelist.txt
+++ b/android_webview/tools/third_party_files_whitelist.txt
@@ -20,8 +20,6 @@ base/md5.cc
# license. This third-party code is taken from Mozilla, the license for which
# we already pick up from third_party/npapi/.
chrome/browser/download/download_extensions.cc
-# String 'copyright' used in code.
-chrome/browser/importer/firefox_importer_utils.cc
# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
# license. Not used on Android.
chrome/browser/importer/firefox_profile_lock.cc
@@ -34,18 +32,6 @@ chrome/browser/importer/firefox_profile_lock_posix.cc
# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
# license. Not used on Android.
chrome/browser/importer/firefox_profile_lock_win.cc
-# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
-# license. Not used on Android.
-chrome/browser/importer/nss_decryptor.cc
-# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
-# license. Not used on Android.
-chrome/browser/importer/nss_decryptor_mac.h
-# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
-# license. Not used on Android.
-chrome/browser/importer/nss_decryptor_system_nss.cc
-# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
-# license. Not used on Android.
-chrome/browser/importer/nss_decryptor_win.h
# Credits notice for ChromeOS.
chrome/browser/resources/chromeos/about_os_credits.html
# String 'copyright' used in code.
@@ -60,6 +46,20 @@ chrome/browser/resources/file_manager/js/media/mediaplayer_scripts.js
chrome/browser/resources/file_manager/js/media/video_player_scripts.js
# String 'copyright' used in code.
chrome/browser/resources/file_manager/js/photo/photo_import_scripts.js
+# String 'copyright' used in code.
+chrome/common/importer/firefox_importer_utils.cc
+# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
+# license. Not used on Android.
+chrome/utility/importer/nss_decryptor.cc
+# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
+# license. Not used on Android.
+chrome/utility/importer/nss_decryptor_mac.h
+# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
+# license. Not used on Android.
+chrome/utility/importer/nss_decryptor_system_nss.cc
+# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
+# license. Not used on Android.
+chrome/utility/importer/nss_decryptor_win.h
# Copyright Google Inc; no license. Example code only.
chrome_frame/cfinstall/examples/jquery.html
# Copyright Google Inc; no license. Example code only.