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

Unified Diff: mojo/edk/system/raw_channel.h

Issue 1641393002: Make //mojo/edk/system use //mojo/util's WeakPtr(Factory) instead of base's. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 11 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 | « mojo/edk/system/channel_manager.cc ('k') | mojo/edk/system/raw_channel_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/raw_channel.h
diff --git a/mojo/edk/system/raw_channel.h b/mojo/edk/system/raw_channel.h
index 86a290b603f42a4cdefbcd1a1e8323c89d13dd77..8398a4bcfd1ddc60733aae18cb4bac76b330bffd 100644
--- a/mojo/edk/system/raw_channel.h
+++ b/mojo/edk/system/raw_channel.h
@@ -8,7 +8,6 @@
#include <memory>
#include <vector>
-#include "base/memory/weak_ptr.h"
#include "mojo/edk/platform/platform_handle.h"
#include "mojo/edk/platform/platform_handle_watcher.h"
#include "mojo/edk/platform/scoped_platform_handle.h"
@@ -18,6 +17,7 @@
#include "mojo/edk/util/mutex.h"
#include "mojo/edk/util/ref_ptr.h"
#include "mojo/edk/util/thread_annotations.h"
+#include "mojo/edk/util/weak_ptr.h"
#include "mojo/public/cpp/system/macros.h"
namespace mojo {
@@ -334,7 +334,7 @@ class RawChannel {
// This is used for posting tasks from write threads to the I/O thread. The
// weak pointers it produces are only used/invalidated on the I/O thread.
- base::WeakPtrFactory<RawChannel> weak_ptr_factory_
+ util::WeakPtrFactory<RawChannel> weak_ptr_factory_
MOJO_GUARDED_BY(write_mutex_);
MOJO_DISALLOW_COPY_AND_ASSIGN(RawChannel);
« no previous file with comments | « mojo/edk/system/channel_manager.cc ('k') | mojo/edk/system/raw_channel_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698