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

Unified Diff: base/memory/shared_memory_handle_win.cc

Issue 2859843002: Add a GUID to base::SharedMemoryHandle. (Closed)
Patch Set: fix guid on android. Created 3 years, 7 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 | « base/memory/shared_memory_handle_posix.cc ('k') | base/memory/shared_memory_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/shared_memory_handle_win.cc
diff --git a/base/memory/shared_memory_handle_win.cc b/base/memory/shared_memory_handle_win.cc
index 7480151b1ab3a8bd0474f576e898fc3e9ce85102..75930c026e822ec2f7ae8fbd962388f0be60aee2 100644
--- a/base/memory/shared_memory_handle_win.cc
+++ b/base/memory/shared_memory_handle_win.cc
@@ -5,28 +5,16 @@
#include "base/memory/shared_memory_handle.h"
#include "base/logging.h"
+#include "base/unguessable_token.h"
namespace base {
SharedMemoryHandle::SharedMemoryHandle()
: handle_(nullptr), ownership_passes_to_ipc_(false) {}
-SharedMemoryHandle::SharedMemoryHandle(HANDLE h)
- : handle_(h), ownership_passes_to_ipc_(false) {}
-
-SharedMemoryHandle::SharedMemoryHandle(const SharedMemoryHandle& handle)
- : handle_(handle.handle_),
- ownership_passes_to_ipc_(handle.ownership_passes_to_ipc_) {}
-
-SharedMemoryHandle& SharedMemoryHandle::operator=(
- const SharedMemoryHandle& handle) {
- if (this == &handle)
- return *this;
-
- handle_ = handle.handle_;
- ownership_passes_to_ipc_ = handle.ownership_passes_to_ipc_;
- return *this;
-}
+SharedMemoryHandle::SharedMemoryHandle(HANDLE h,
+ const base::UnguessableToken& guid)
+ : handle_(h), ownership_passes_to_ipc_(false), guid_(guid) {}
void SharedMemoryHandle::Close() const {
DCHECK(handle_ != nullptr);
@@ -45,7 +33,7 @@ SharedMemoryHandle SharedMemoryHandle::Duplicate() const {
if (!success)
return SharedMemoryHandle();
- base::SharedMemoryHandle handle(duped_handle);
+ base::SharedMemoryHandle handle(duped_handle, GetGUID());
handle.SetOwnershipPassesToIPC(true);
return handle;
}
« no previous file with comments | « base/memory/shared_memory_handle_posix.cc ('k') | base/memory/shared_memory_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698