chrome/chrome.gyp - Issue 18501013: Move most importer code to chrome/utility/importer

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: fix include on mac 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

« chrome/browser/importer/in_process_importer_bridge.cc ('K') | « chrome/browser/ui/webui/options/import_data_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | chrome/common/importer/firefox_importer_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome.gyp

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp

index 2ecf096c82dfb5762c7d2efdf69c242142ba2f97..b5de71840cb1b74fb959727603d446262ca04750 100644

--- a/chrome/chrome.gyp

+++ b/chrome/chrome.gyp

@@ -288,6 +288,7 @@

'dependencies': [

'../base/base.gyp:base',

'../content/content.gyp:content_utility',

+ '../crypto/crypto.gyp:crypto', # nss on Linux.

gab 2013/07/09 20:48:31 So shouldn't this instead go in an 'OS=="linux" an

scottmg 2013/07/09 21:16:45 Actually, I think the comment is wrong, it's just

gab 2013/07/09 21:29:43 Right, so the dependency should only exist if incl

'../skia/skia.gyp:skia',

'../third_party/libxml/libxml.gyp:libxml',

'common',

@@ -295,6 +296,36 @@

'sources': [

'utility/chrome_content_utility_client.cc',

'utility/chrome_content_utility_client.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',

gab 2013/07/09 20:48:31 nit: duplicate entry (there should probably be a p

scottmg 2013/07/09 21:16:45 Done.

+ '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_system_nss.cc',

+ 'utility/importer/nss_decryptor_system_nss.h',

+ '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',

@@ -302,6 +333,7 @@

'include_dirs': [

'..',

+ '<(grit_out_dir)',

'conditions': [

['toolkit_uses_gtk == 1', {

@@ -320,9 +352,21 @@

'utility/media_galleries/pmp_column_reader.cc',

'utility/media_galleries/pmp_column_reader.h',

+ 'sources!': [

+ 'utility/importer/nss_decryptor_system_nss.cc',

+ 'utility/importer/nss_decryptor_system_nss.h',

+ ],

+ }],

+ ['use_openssl==1', {

+ 'sources!': [

+ 'utility/importer/nss_decryptor.cc',

+ 'utility/importer/nss_decryptor_system_nss.cc',

+ 'utility/importer/nss_decryptor_system_nss.h',

+ ]

}],

['OS=="android"', {

'sources!': [

+ 'utility/importer/bookmark_html_reader.cc',

'utility/profile_import_handler.cc',

}],