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

Unified Diff: memory/shared_memory_handle.h

Issue 2050803003: Update to Chromium //base at Chromium commit e3a753f17bac62738b0dbf0b36510f767b081e4b. (Closed) Base URL: https://github.com/domokit/base.git@master
Patch Set: Created 4 years, 6 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 | « memory/memory_pressure_listener_unittest.cc ('k') | memory/shared_memory_handle_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: memory/shared_memory_handle.h
diff --git a/memory/shared_memory_handle.h b/memory/shared_memory_handle.h
index 7af8729976dab980c39d7ace7d0b0bef7a677637..01a7f75273dd617e95c54a1484c8f24d64acaad6 100644
--- a/memory/shared_memory_handle.h
+++ b/memory/shared_memory_handle.h
@@ -9,7 +9,7 @@
#if defined(OS_WIN)
#include <windows.h>
-#elif defined(OS_MACOSX) && !defined(OS_IOS)
+#elif defined(OS_MACOSX)
#include <sys/types.h>
#include "base/base_export.h"
#include "base/file_descriptor_posix.h"
@@ -27,7 +27,7 @@ class Pickle;
// the underlying OS handle to a shared memory segment.
#if defined(OS_WIN)
typedef HANDLE SharedMemoryHandle;
-#elif defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS))
+#elif defined(OS_POSIX) && !defined(OS_MACOSX)
typedef FileDescriptor SharedMemoryHandle;
#else
class BASE_EXPORT SharedMemoryHandle {
« no previous file with comments | « memory/memory_pressure_listener_unittest.cc ('k') | memory/shared_memory_handle_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698