diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 05:20:21 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 05:20:21 +0000 |
| commit | 420bfe34fa837807195fb021cb8db67d51a94953 (patch) | |
| tree | f2e7c66cf5122bd5b870e49246257fbc9e79dbfa /chrome | |
| parent | 9ba8182683658ee51f2b9f5862de26ef0130c9b8 (diff) | |
| download | chromium_src-420bfe34fa837807195fb021cb8db67d51a94953.zip chromium_src-420bfe34fa837807195fb021cb8db67d51a94953.tar.gz chromium_src-420bfe34fa837807195fb021cb8db67d51a94953.tar.bz2 | |
Finish porting importer for Posix:
* Remove references to toolbar_importer.cc as that file was removed from the tree.
* Add firefox[23]_importer.cc to the Posix build.
* Move ie_importer.cc to the win-only section of the scons file.
Review URL: http://codereview.chromium.org/28249
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser.scons | 9 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 28d0ddf..1110e62 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -337,8 +337,6 @@ input_files = ChromeFileList([ 'importer/importer.h', 'importer/mork_reader.cc', 'importer/mork_reader.h', - 'importer/toolbar_importer.cc', - 'importer/toolbar_importer.h', ]), MSVSFilter('Drag & Drop', [ 'drag_utils.cc', @@ -687,12 +685,6 @@ if not env.Bit('windows'): 'icon_loader.cc', 'icon_manager.cc', 'ime_input.cc', - # Hold off on firefox[23]_importer.cc until importer.cc has been ported. - # Otherwise shared link builds won't work on Linux. - 'importer/firefox2_importer.cc', - 'importer/firefox3_importer.cc', - 'importer/ie_importer.cc', - 'importer/toolbar_importer.cc', 'jankometer.cc', 'login_prompt.cc', 'memory_details.cc', @@ -726,6 +718,7 @@ if not env.Bit('windows'): 'browser_main_win.cc', 'history/history_publisher_win.cc', 'importer/firefox_profile_lock_win.cc', + 'importer/ie_importer.cc', 'js_before_unload_handler_win.cc', 'jsmessage_box_handler_win.cc', 'password_manager/ie7_password.cc', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 25ad4ab..ebaef18 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1166,8 +1166,6 @@ 'browser/bookmarks/bookmark_drop_info.cc', 'browser/debugger/debugger_view.cc', 'browser/debugger/debugger_window.cc', - 'browser/importer/firefox2_importer.cc', - 'browser/importer/firefox3_importer.cc', 'browser/importer/ie_importer.cc', 'browser/tab_contents/native_ui_contents.cc', 'browser/tab_contents/render_view_context_menu_controller.cc', |