| Index: chrome/chrome.gyp
 | 
| ===================================================================
 | 
| --- chrome/chrome.gyp	(revision 16487)
 | 
| +++ chrome/chrome.gyp	(working copy)
 | 
| @@ -1050,9 +1050,18 @@
 | 
|          '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',
 | 
| +        '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.h',
 | 
| +        'browser/password_manager/password_store_win.cc',
 | 
|          'browser/plugin_installer.cc',
 | 
|          'browser/plugin_installer.h',
 | 
|          'browser/plugin_process_host.cc',
 | 
| @@ -1495,6 +1504,8 @@
 | 
|          }],
 | 
|          ['OS=="linux"', {
 | 
|            'dependencies': [
 | 
| +            '../build/linux/system.gyp:dbus-glib',
 | 
| +            '../build/linux/system.gyp:gnome-keyring',
 | 
|              '../build/linux/system.gyp:gtk',
 | 
|            ],
 | 
|            'sources!': [
 | 
| @@ -1504,6 +1515,8 @@
 | 
|              'browser/debugger/debugger_shell_stubs.cc',
 | 
|              # Windows-specific files.
 | 
|              'browser/download/download_exe.cc',
 | 
| +            'browser/password_manager/password_store_win.cc',
 | 
| +            'browser/password_manager/password_store_win.h',
 | 
|            ],
 | 
|          }],
 | 
|          ['OS=="linux" and toolkit_views==0', {
 | 
| @@ -1525,6 +1538,12 @@
 | 
|              'browser/bookmarks/bookmark_context_menu.cc',
 | 
|              'browser/bookmarks/bookmark_drop_info.cc',
 | 
|              'browser/debugger/debugger_shell_stubs.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',
 | 
|            ],
 | 
|            'sources': [
 | 
|              # Build the necessary GTM sources
 | 
| @@ -1565,6 +1584,10 @@
 | 
|            'sources!': [
 | 
|              'browser/debugger/debugger_shell_stubs.cc',
 | 
|              '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': {
 | 
| 
 |