Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8496)

Unified Diff: chrome/chrome.gyp

Issue 18501013: Move most importer code to chrome/utility/importer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: another gyp attempt Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/import_data_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 39f6177e61919486d99fdd15f63a4475b6440b88..b92753ffa33f076e02489869240bc695f1070ca0 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -300,6 +300,33 @@
'utility/chrome_content_utility_client.h',
'utility/extensions/unpacker.cc',
'utility/extensions/unpacker.h',
+ 'utility/importer/bookmark_html_reader.cc',
+ 'utility/importer/bookmark_html_reader.h',
+ 'utility/importer/bookmarks_file_importer.cc',
+ 'utility/importer/bookmarks_file_importer.h',
+ 'utility/importer/external_process_importer_bridge.cc',
+ 'utility/importer/external_process_importer_bridge.h',
+ 'utility/importer/favicon_reencode.cc',
+ 'utility/importer/favicon_reencode.h',
+ 'utility/importer/firefox3_importer.cc',
+ 'utility/importer/firefox3_importer.h',
+ 'utility/importer/firefox_importer_unittest_messages_internal.h',
+ 'utility/importer/firefox_importer_unittest_utils.h',
+ 'utility/importer/firefox_importer_unittest_utils_mac.cc',
+ 'utility/importer/ie_importer_win.cc',
+ 'utility/importer/ie_importer_win.h',
+ 'utility/importer/importer.cc',
+ 'utility/importer/importer.h',
+ 'utility/importer/importer_creator.cc',
+ 'utility/importer/importer_creator.h',
+ 'utility/importer/nss_decryptor.cc',
+ 'utility/importer/nss_decryptor.h',
+ 'utility/importer/nss_decryptor_mac.h',
+ 'utility/importer/nss_decryptor_mac.mm',
+ 'utility/importer/nss_decryptor_win.cc',
+ 'utility/importer/nss_decryptor_win.h',
+ 'utility/importer/safari_importer.h',
+ 'utility/importer/safari_importer.mm',
'utility/itunes_pref_parser_win.cc',
'utility/itunes_pref_parser_win.h',
'utility/profile_import_handler.cc',
@@ -307,6 +334,7 @@
],
'include_dirs': [
'..',
+ '<(grit_out_dir)',
],
'conditions': [
['toolkit_uses_gtk == 1', {
@@ -326,9 +354,24 @@
'utility/media_galleries/pmp_column_reader.h',
],
}],
- ['OS=="android"', {
+ ['use_openssl==1', {
'sources!': [
- 'utility/profile_import_handler.cc',
+ 'utility/importer/nss_decryptor.cc',
+ ]
+ }],
+ ['OS!="win" and OS!="mac" and use_openssl==0', {
+ 'dependencies': [
+ '../crypto/crypto.gyp:crypto',
+ ],
+ 'sources': [
+ 'utility/importer/nss_decryptor_system_nss.cc',
+ 'utility/importer/nss_decryptor_system_nss.h',
+ ],
+ }],
+ ['OS=="android"', {
+ 'sources/': [
+ ['exclude', '^utility/importer/'],
+ ['exclude', '^utility/profile_import_handler\.cc'],
],
}],
['enable_mdns == 1', {
« no previous file with comments | « chrome/browser/ui/webui/options/import_data_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698