Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index c8ab9b7f8a17ca24af5202e203875201bd0e263c..15208ef44fcfd131089a3754a7303626e873c3f4 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -240,8 +240,6 @@ |
'browser/bookmarks/bookmark_codec.h', |
'browser/bookmarks/bookmark_expanded_state_tracker.cc', |
'browser/bookmarks/bookmark_expanded_state_tracker.h', |
- 'browser/importer/bookmark_html_reader.cc', |
- 'browser/importer/bookmark_html_reader.h', |
'browser/bookmarks/bookmark_html_writer.cc', |
'browser/bookmarks/bookmark_html_writer.h', |
'browser/bookmarks/bookmark_index.cc', |
@@ -832,60 +830,27 @@ |
'browser/idle_win.cc', |
'browser/image_decoder.cc', |
'browser/image_decoder.h', |
- 'browser/importer/bookmarks_file_importer.cc', |
- 'browser/importer/bookmarks_file_importer.h', |
- 'browser/importer/external_process_importer_bridge.cc', |
- 'browser/importer/external_process_importer_bridge.h', |
'browser/importer/external_process_importer_client.cc', |
'browser/importer/external_process_importer_client.h', |
'browser/importer/external_process_importer_host.cc', |
'browser/importer/external_process_importer_host.h', |
- 'browser/importer/reencode_favicon.cc', |
- 'browser/importer/reencode_favicon.h', |
- 'browser/importer/firefox3_importer.cc', |
- 'browser/importer/firefox3_importer.h', |
- 'browser/importer/firefox_importer_utils.cc', |
- 'browser/importer/firefox_importer_utils.h', |
- 'browser/importer/firefox_importer_utils_linux.cc', |
- 'browser/importer/firefox_importer_utils_mac.mm', |
- 'browser/importer/firefox_importer_utils_win.cc', |
'browser/importer/firefox_profile_lock.cc', |
'browser/importer/firefox_profile_lock.h', |
'browser/importer/firefox_profile_lock_posix.cc', |
'browser/importer/firefox_profile_lock_win.cc', |
'browser/importer/firefox_proxy_settings.cc', |
'browser/importer/firefox_proxy_settings.h', |
- 'browser/importer/ie_importer.cc', |
- 'browser/importer/ie_importer.h', |
- 'browser/importer/ie_importer_test_registry_overrider_win.cc', |
- 'browser/importer/ie_importer_test_registry_overrider_win.h', |
- 'browser/importer/ie_importer_utils_win.cc', |
- 'browser/importer/ie_importer_utils_win.h', |
- 'browser/importer/importer.cc', |
- 'browser/importer/importer.h', |
- 'browser/importer/importer_bridge.cc', |
- 'browser/importer/importer_bridge.h', |
- 'browser/importer/importer_creator.cc', |
- 'browser/importer/importer_creator.h', |
'browser/importer/importer_list.cc', |
'browser/importer/importer_list.h', |
'browser/importer/importer_list_observer.h', |
'browser/importer/importer_lock_dialog.h', |
'browser/importer/importer_progress_observer.h', |
+ 'browser/importer/importer_uma.cc', |
+ 'browser/importer/importer_uma.h', |
'browser/importer/in_process_importer_bridge.cc', |
'browser/importer/in_process_importer_bridge.h', |
- 'browser/importer/nss_decryptor.cc', |
- 'browser/importer/nss_decryptor.h', |
- 'browser/importer/nss_decryptor_mac.h', |
- 'browser/importer/nss_decryptor_mac.mm', |
- 'browser/importer/nss_decryptor_system_nss.cc', |
- 'browser/importer/nss_decryptor_system_nss.h', |
- 'browser/importer/nss_decryptor_win.cc', |
- 'browser/importer/nss_decryptor_win.h', |
'browser/importer/profile_writer.cc', |
'browser/importer/profile_writer.h', |
- 'browser/importer/safari_importer.h', |
- 'browser/importer/safari_importer.mm', |
'browser/infobars/confirm_infobar_delegate.cc', |
'browser/infobars/confirm_infobar_delegate.h', |
'browser/infobars/infobar.cc', |
@@ -2940,7 +2905,6 @@ |
'sources!': [ |
# Bookmark export/import are handled via the BookmarkColumns |
# ContentProvider. |
- 'browser/importer/bookmark_html_reader.cc', |
'browser/bookmarks/bookmark_html_writer.cc', |
'browser/ssl/ssl_add_certificate.cc', |
@@ -3030,8 +2994,6 @@ |
'sources!': [ |
'browser/automation/automation_provider_list_generic.cc', |
'browser/first_run/upgrade_util.cc', |
- 'browser/importer/nss_decryptor_system_nss.cc', |
- 'browser/importer/nss_decryptor_system_nss.h', |
'browser/jankometer.cc', |
'browser/lifetime/application_lifetime_stub.cc', |
'browser/password_manager/login_database_posix.cc', |
@@ -3095,8 +3057,6 @@ |
'sources!': [ |
'browser/first_run/first_run_dialog.h', |
'browser/history/history_publisher_none.cc', |
- 'browser/importer/nss_decryptor_system_nss.cc', |
- 'browser/importer/nss_decryptor_system_nss.h', |
'browser/lifetime/application_lifetime_stub.cc', |
'browser/profiles/profile_shortcut_manager_stub.cc', |
'browser/user_data_dir_extractor.cc', |
@@ -3113,7 +3073,6 @@ |
# Exclude files that should be excluded for all non-Windows platforms. |
['exclude', '^browser/first_run/try_chrome_dialog_view.cc'], |
['exclude', '^browser/first_run/try_chrome_dialog_view.h'], |
- ['exclude', '^browser/importer/ie_importer.cc'], |
# Exclude all of hang_monitor. |
['exclude', '^browser/hang_monitor/'], |
@@ -3165,13 +3124,6 @@ |
'browser/plugins/plugins_resource_service.h', |
], |
}], |
- [ 'use_openssl==1', { |
- 'sources!': [ |
- 'browser/importer/nss_decryptor.cc', |
- 'browser/importer/nss_decryptor_system_nss.cc', |
- 'browser/importer/nss_decryptor_system_nss.h', |
- ] |
- }], |
['enable_app_list==1', { |
'dependencies': [ |
'../ui/app_list/app_list.gyp:app_list', |