diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 03:48:22 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 03:48:22 +0000 |
| commit | 32080ab87e1954ccb0e2da31587ec30351284124 (patch) | |
| tree | 98a695f9049a58c3676c1dd5e353908a1809486a /net | |
| parent | 25bda7e948314eb53ad586a6248ee87204236413 (diff) | |
| download | chromium_src-32080ab87e1954ccb0e2da31587ec30351284124.zip chromium_src-32080ab87e1954ccb0e2da31587ec30351284124.tar.gz chromium_src-32080ab87e1954ccb0e2da31587ec30351284124.tar.bz2 | |
net: preparatory patch for crbug.com/142782
This patch is needed so that we can have a clean patch to merge
to M21.
https://chromiumcodereview.appspot.com/10830326/
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/nss_ssl_util.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc index d262f93..54f0a2c 100644 --- a/net/socket/nss_ssl_util.cc +++ b/net/socket/nss_ssl_util.cc @@ -2,6 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// HACK for crbug.com/142782. I've put it all the way up here to avoid a merge +// collision +namespace base { +namespace mac { +bool IsOSSnowLeopardOrLater() { return true; } +} // namespace mac +} // namespace base + #include "net/socket/nss_ssl_util.h" #include <nss.h> |