diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 19:26:00 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 19:26:00 +0000 |
| commit | ac1ada5154efcd9112152db924602aa15b7aff36 (patch) | |
| tree | 706d8b04100a85811af36582afe82c612519bdc8 /chrome | |
| parent | 62d9c3e630bc39621576795b2cf761a651bdf165 (diff) | |
| download | chromium_src-ac1ada5154efcd9112152db924602aa15b7aff36.zip chromium_src-ac1ada5154efcd9112152db924602aa15b7aff36.tar.gz chromium_src-ac1ada5154efcd9112152db924602aa15b7aff36.tar.bz2 | |
Add ssl_config_service_manager_pref.cc and
ssl_config_service_manager_system.cc to 'sources' for all
platforms, and then exclude them for the platforms that
don't use them. This allows us to view/search the files
in Visual Studio.
R=mattm,mark
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4182004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_browser.gypi | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index ef2d698..df182be 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2248,6 +2248,8 @@ 'browser/net/sqlite_persistent_cookie_store.cc', 'browser/net/sqlite_persistent_cookie_store.h', 'browser/net/ssl_config_service_manager.h', + 'browser/net/ssl_config_service_manager_pref.cc', + 'browser/net/ssl_config_service_manager_system.cc', 'browser/net/url_fixer_upper.cc', 'browser/net/url_fixer_upper.h', 'browser/net/url_info.cc', @@ -3416,7 +3418,6 @@ ], 'sources': [ 'browser/crash_handler_host_linux.h', - 'browser/net/ssl_config_service_manager_pref.cc', 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp', 'third_party/mozilla_security_manager/nsNSSCertHelper.h', 'third_party/mozilla_security_manager/nsNSSCertificate.cpp', @@ -3472,6 +3473,17 @@ 'browser/file_path_watcher_stub.cc', ], }], + # Use system SSL settings on Mac and Windows. Use preferences + # for SSL settings on other platforms. + ['OS=="mac" or OS=="win"', { + 'sources!': [ + 'browser/net/ssl_config_service_manager_pref.cc', + ], + }, { # else + 'sources!': [ + 'browser/net/ssl_config_service_manager_system.cc', + ], + }], ['OS=="mac"', { 'sources!': [ 'browser/automation/automation_provider_list_generic.cc', @@ -3493,7 +3505,6 @@ 'browser/views/extensions/extension_view.h', ], 'sources': [ - 'browser/net/ssl_config_service_manager_system.cc', # Build Apple sample code '../third_party/apple/ImageAndTextCell.h', '../third_party/apple/ImageAndTextCell.m', @@ -3652,7 +3663,6 @@ } }, 'sources': [ - 'browser/net/ssl_config_service_manager_system.cc', # Using built-in rule in vstudio for midl. 'browser/history/history_indexer.idl', ], |