diff options
| author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 23:40:30 +0000 |
|---|---|---|
| committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 23:40:30 +0000 |
| commit | ca9b7dd291b73243b21c03c472544387f4886dae (patch) | |
| tree | e5453c73e8c2d7d3c92aeffa5e42894e4e745e39 /chrome/chrome_browser.gypi | |
| parent | c0cfae67ccd13effa179eb2c6ec700f8a1b1d2e3 (diff) | |
| download | chromium_src-ca9b7dd291b73243b21c03c472544387f4886dae.zip chromium_src-ca9b7dd291b73243b21c03c472544387f4886dae.tar.gz chromium_src-ca9b7dd291b73243b21c03c472544387f4886dae.tar.bz2 | |
- USE_NSS instead of LINUX where applicable
- Rename nss_decryptor_linux to nss_decryptor_posix as it's more appropriate
Review URL: http://codereview.chromium.org/656012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rwxr-xr-x | chrome/chrome_browser.gypi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index d74a627..cf0779c 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1297,10 +1297,10 @@ 'browser/importer/mork_reader.h', 'browser/importer/nss_decryptor.cc', 'browser/importer/nss_decryptor.h', - 'browser/importer/nss_decryptor_linux.cc', - 'browser/importer/nss_decryptor_linux.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/safari_importer.h', @@ -2262,6 +2262,7 @@ ['OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../build/linux/system.gyp:gtkprint', '../build/linux/system.gyp:nss', ], }], @@ -2271,6 +2272,8 @@ 'browser/bookmarks/bookmark_context_menu.cc', 'browser/bookmarks/bookmark_drop_info.cc', 'browser/dock_info.cc', + 'browser/importer/nss_decryptor_system_nss.cc', + 'browser/importer/nss_decryptor_system_nss.h', 'browser/jankometer.cc', 'browser/password_manager/password_store_gnome.h', 'browser/password_manager/password_store_gnome.cc', @@ -2436,6 +2439,8 @@ 'sources!': [ 'browser/browser_list_stub.cc', 'browser/history/history_publisher_none.cc', + 'browser/importer/nss_decryptor_system_nss.cc', + 'browser/importer/nss_decryptor_system_nss.h', 'browser/password_manager/password_store_gnome.h', 'browser/password_manager/password_store_gnome.cc', 'browser/password_manager/password_store_kwallet.h', |