Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1298)

Unified Diff: chrome/chrome.gyp

Issue 115658: First phase of Mac Keychain integration. For the overall plan, see the design... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/password_manager/password_store_mac_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 16751)
+++ chrome/chrome.gyp (working copy)
@@ -24,25 +24,25 @@
'target_defaults': {
'sources/': [
['exclude', '/(cocoa|gtk|win)/'],
- ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|x)\\.(cc|mm?)$'],
+ ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|x)(_unittest)?\\.(cc|mm?)$'],
['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
],
'conditions': [
['OS=="linux"', {'sources/': [
['include', '/gtk/'],
- ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
+ ['include', '_(gtk|linux|posix|skia|x)(_unittest)?\\.cc$'],
['include', '/(gtk|x11)_[^/]*\\.cc$'],
]}],
['OS=="mac"', {'sources/': [
['include', '/cocoa/'],
- ['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'],
+ ['include', '_(cocoa|mac|posix)(_unittest)?\\.(cc|mm?)$'],
]}, { # else: OS != "mac"
'sources/': [
['exclude', '\\.mm?$'],
],
}],
['OS=="win"', {'sources/': [
- ['include', '_(win)\\.cc$'],
+ ['include', '_(win)(_unittest)?\\.cc$'],
['include', '/win/'],
['include', '/win_[^/]*\\.cc$'],
]}],
@@ -1023,6 +1023,8 @@
'browser/jankometer.h',
'browser/jsmessage_box_handler.cc',
'browser/jsmessage_box_handler.h',
+ 'browser/keychain_mac.cc',
+ 'browser/keychain_mac.h',
'browser/load_from_memory_cache_details.h',
'browser/load_notification_details.h',
'browser/location_bar.h',
@@ -1085,6 +1087,9 @@
# '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',
@@ -2913,6 +2918,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',
« no previous file with comments | « chrome/browser/password_manager/password_store_mac_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698