diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-30 00:51:16 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-30 00:51:16 +0000 |
| commit | c01ec9515d1892e2a62d3e4423a2bb37ac79e551 (patch) | |
| tree | e5906c772e92e04e3b333716b78a4b43d185c7f6 /chrome/chrome.gyp | |
| parent | 70d56be631ab6616cd7661468df6ba91c5821193 (diff) | |
| download | chromium_src-c01ec9515d1892e2a62d3e4423a2bb37ac79e551.zip chromium_src-c01ec9515d1892e2a62d3e4423a2bb37ac79e551.tar.gz chromium_src-c01ec9515d1892e2a62d3e4423a2bb37ac79e551.tar.bz2 | |
Re-land the password store work from bug 8205, with changes that should fix bug 12479. The Linux pieces are still disabled, however.
BUG=8205
TEST=Password autofill should continue to work on Windows.
Review URL: http://codereview.chromium.org/114057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 87dc67c..b0d256d 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1091,9 +1091,23 @@ 'browser/password_manager/ie7_password.h', 'browser/password_manager/password_form_manager.cc', 'browser/password_manager/password_form_manager.h', - 'browser/password_manager/password_form_manager_win.cc', 'browser/password_manager/password_manager.cc', 'browser/password_manager/password_manager.h', + 'browser/password_manager/password_store.cc', + 'browser/password_manager/password_store.h', + 'browser/password_manager/password_store_default.cc', + 'browser/password_manager/password_store_default.h', + # Temporarily disabled while we figure some stuff out. + # http://code.google.com/p/chromium/issues/detail?id=12351 + # 'browser/password_manager/password_store_gnome.h', + # 'browser/password_manager/password_store_gnome.cc', + # 'browser/password_manager/password_store_kwallet.h', + # 'browser/password_manager/password_store_kwallet.cc', + 'browser/password_manager/password_store_mac_internal.h', + 'browser/password_manager/password_store_mac.h', + 'browser/password_manager/password_store_mac.cc', + 'browser/password_manager/password_store_win.h', + 'browser/password_manager/password_store_win.cc', 'browser/plugin_installer.cc', 'browser/plugin_installer.h', 'browser/plugin_process_host.cc', @@ -1553,6 +1567,10 @@ }], ['OS=="linux"', { 'dependencies': [ + # Temporarily disabled while we figure some stuff out. + # http://code.google.com/p/chromium/issues/detail?id=12351 + # '../build/linux/system.gyp:dbus-glib', + # '../build/linux/system.gyp:gnome-keyring', '../build/linux/system.gyp:gtk', ], 'sources!': [ @@ -1561,6 +1579,8 @@ 'browser/extensions/extension_view.cc', 'browser/extensions/extension_view.h', # Windows-specific files. + 'browser/password_manager/password_store_win.cc', + 'browser/password_manager/password_store_win.h', ], 'conditions': [ ['linux_breakpad==1', { @@ -1603,6 +1623,12 @@ 'browser/automation/automation_provider_list_generic.cc', 'browser/bookmarks/bookmark_context_menu.cc', 'browser/bookmarks/bookmark_drop_info.cc', + 'browser/password_manager/password_store_gnome.h', + 'browser/password_manager/password_store_gnome.cc', + 'browser/password_manager/password_store_kwallet.h', + 'browser/password_manager/password_store_kwallet.cc', + 'browser/password_manager/password_store_win.cc', + 'browser/password_manager/password_store_win.h', 'browser/extensions/extension_shelf.cc', 'browser/extensions/extension_shelf.h', 'browser/extensions/extension_view.cc', @@ -1654,6 +1680,10 @@ ], 'sources!': [ 'browser/history/history_publisher_none.cc', + 'browser/password_manager/password_store_gnome.h', + 'browser/password_manager/password_store_gnome.cc', + 'browser/password_manager/password_store_kwallet.h', + 'browser/password_manager/password_store_kwallet.cc', ], 'configurations': { 'Debug': { @@ -3109,6 +3139,7 @@ 'browser/net/url_fixer_upper_unittest.cc', 'browser/password_manager/encryptor_unittest.cc', 'browser/password_manager/password_form_manager_unittest.cc', + 'browser/password_manager/password_store_mac_unittest.cc', 'browser/printing/page_number_unittest.cc', 'browser/printing/page_overlays_unittest.cc', 'browser/printing/page_range_unittest.cc', |