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

Unified Diff: mojo/public/cpp/bindings/interface_ptr.h

Issue 2047633002: Revert of Remove base/move.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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
Index: mojo/public/cpp/bindings/interface_ptr.h
diff --git a/mojo/public/cpp/bindings/interface_ptr.h b/mojo/public/cpp/bindings/interface_ptr.h
index 7bc8921cd66d55c69205f72faa7b16ec1f499500..041c24264147084046654e4a41905f9b95d7a537 100644
--- a/mojo/public/cpp/bindings/interface_ptr.h
+++ b/mojo/public/cpp/bindings/interface_ptr.h
@@ -36,6 +36,8 @@
// any thread.
template <typename Interface>
class InterfacePtr {
+ DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(InterfacePtr);
+
public:
// Constructs an unbound InterfacePtr.
InterfacePtr() {}
@@ -199,7 +201,6 @@
// Allow InterfacePtr<> to be used in boolean expressions, but not
// implicitly convertible to a real bool (which is dangerous).
private:
- // TODO(dcheng): Use an explicit conversion operator.
typedef internal::InterfacePtrState<Interface,
Interface::PassesAssociatedKinds_>
InterfacePtr::*Testable;
@@ -221,8 +222,6 @@
typedef internal::InterfacePtrState<Interface,
Interface::PassesAssociatedKinds_> State;
mutable State internal_state_;
-
- DISALLOW_COPY_AND_ASSIGN(InterfacePtr);
};
// If |info| is valid (containing a valid message pipe handle), returns an
« no previous file with comments | « mojo/public/cpp/bindings/associated_interface_request.h ('k') | mojo/public/cpp/bindings/interface_ptr_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698