projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
net
/
cookie_store_util.cc
diff --git
a/src/chrome/browser/net/cookie_store_util.cc
b/src/chrome/browser/net/cookie_store_util.cc
index
e20c966
..
6d90e8d
100644
(file)
--- a/
src/chrome/browser/net/cookie_store_util.cc
+++ b/
src/chrome/browser/net/cookie_store_util.cc
@@
-99,7
+99,7
@@
net::CookieMonsterDelegate* CreateCookieDelegate(Profile* profile) {
new ChromeCookieMonsterDelegate(profile));
}
new ChromeCookieMonsterDelegate(profile));
}
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_
MACOSX) || defined(OS_
LINUX)
namespace {
// Use the operating system's mechanisms to encrypt cookies before writing
namespace {
// Use the operating system's mechanisms to encrypt cookies before writing
@@
-136,10
+136,10
@@
base::LazyInstance<CookieOSCryptoDelegate> g_cookie_crypto_delegate =
content::CookieCryptoDelegate* GetCookieCryptoDelegate() {
return g_cookie_crypto_delegate.Pointer();
}
content::CookieCryptoDelegate* GetCookieCryptoDelegate() {
return g_cookie_crypto_delegate.Pointer();
}
-#else // defined(OS_WIN) || defined(OS_LINUX)
+#else // defined(OS_WIN) || defined(OS_
MACOSX) || defined(OS_
LINUX)
content::CookieCryptoDelegate* GetCookieCryptoDelegate() {
return NULL;
}
content::CookieCryptoDelegate* GetCookieCryptoDelegate() {
return NULL;
}
-#endif // defined(OS_WIN) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_
MACOSX) || defined(OS_
LINUX)
} // namespace chrome_browser_net
} // namespace chrome_browser_net