diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 16:58:28 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 16:58:28 +0000 |
commit | 30a52ce795bb546bccec08deea22c2cd0c9fcd7a (patch) | |
tree | 1ff762a1c415d1caf24f9c956f5c30e73144aa7c /chrome | |
parent | e30755a9e4123c51d27bbe8fcde29f495526e557 (diff) | |
download | chromium_src-30a52ce795bb546bccec08deea22c2cd0c9fcd7a.zip chromium_src-30a52ce795bb546bccec08deea22c2cd0c9fcd7a.tar.gz chromium_src-30a52ce795bb546bccec08deea22c2cd0c9fcd7a.tar.bz2 |
Reverting 7214.
Review URL: http://codereview.chromium.org/15403
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/browser.scons | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 5326823..4797c10 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -83,6 +83,7 @@ if env['PLATFORM'] in ('posix', 'win32'): 'importer/firefox2_importer.cc', 'importer/firefox3_importer.cc', 'importer/firefox_profile_lock.cc', + 'importer/firefox_profile_lock_posix.cc', 'importer/mork_reader.cc', 'meta_table_helper.cc', 'metrics_log.cc', @@ -105,8 +106,6 @@ if env['PLATFORM'] in ('posix', 'win32'): 'safe_browsing/safe_browsing_service.cc', 'safe_browsing/safe_browsing_util.cc', 'session_startup_pref.cc', - 'sessions/session_command.cc', - 'sessions/session_id.cc', 'spellcheck_worditerator.cc', 'spellchecker.cc', 'ssl_error_info.cc', @@ -256,6 +255,8 @@ if env['PLATFORM'] == 'win32': 'sandbox_policy.cc', 'sessions/base_session_service.cc', 'sessions/session_backend.cc', + 'sessions/session_command.cc', + 'sessions/session_id.cc', 'sessions/session_restore.cc', 'sessions/session_service.cc', 'sessions/session_types.cc', @@ -295,15 +296,10 @@ if env['PLATFORM'] == 'win32': env.TypeLibrary('history/history_indexer.idl') input_files.extend([ - 'importer/firefox_profile_lock_win.cc', - 'render_widget_host_view_win.cc', 'web_contents_view_win.cc', + 'render_widget_host_view_win.cc', ]) -if env['PLATFORM'] in ('darwin', 'posix'): - input_files.extend([ - 'importer/firefox_profile_lock_posix.cc', - ]) if env['PLATFORM'] in ('posix', 'win32'): # TODO: This should work for all platforms. |