Commit 5b35b285 authored by Sean McAllister's avatar Sean McAllister Committed by Commit Bot

Refactor OS_LINUX preprocessor directive for LaCrOS effort.

Currently, ChromeOS defines the OS_LINUX directive as well as
OS_CHROMEOS.  We're working to separate these two, so we're
making the fact that OS_LINUX == OS_LINUX || OS_CHROMEOS
explicit.

This is changes for /components/cookie_config

This CL was uploaded by git cl split.

R=blundell@chromium.org

Bug: 1110266
Change-Id: I61908a6d547eb9efefc9cc4e07e7f95188f3c1df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2371286Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Commit-Queue: Sean McAllister <smcallis@google.com>
Cr-Commit-Position: refs/heads/master@{#803136}
parent 58e2a895
......@@ -11,7 +11,8 @@
namespace cookie_config {
#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX)
#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \
defined(OS_CHROMEOS)
namespace {
// Use the operating system's mechanisms to encrypt cookies before writing
......@@ -63,10 +64,12 @@ base::LazyInstance<CookieOSCryptoDelegate>::DestructorAtExit
net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
return g_cookie_crypto_delegate.Pointer();
}
#else // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX)
#else // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) ||
// defined(OS_CHROMEOS)
net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
return NULL;
}
#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX)
#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) ||
// defined(OS_CHROMEOS)
} // namespace cookie_config
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment