Index: mojo/public/cpp/bindings/associated_interface_ptr.h |
diff --git a/mojo/public/cpp/bindings/associated_interface_ptr.h b/mojo/public/cpp/bindings/associated_interface_ptr.h |
index 9846b33d5cdad2c6c667b16072515c1329599d6f..c4435ee599b73c1e47eb2d9d86f4c656080fb967 100644 |
--- a/mojo/public/cpp/bindings/associated_interface_ptr.h |
+++ b/mojo/public/cpp/bindings/associated_interface_ptr.h |
@@ -25,6 +25,8 @@ |
// InterfacePtr, except that it doesn't own a message pipe handle. |
template <typename Interface> |
class AssociatedInterfacePtr { |
+ DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(AssociatedInterfacePtr) |
+ |
public: |
// Constructs an unbound AssociatedInterfacePtr. |
AssociatedInterfacePtr() {} |
@@ -155,7 +157,6 @@ |
// Allow AssociatedInterfacePtr<> 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::AssociatedInterfacePtrState<Interface> |
AssociatedInterfacePtr::*Testable; |
@@ -175,8 +176,6 @@ |
typedef internal::AssociatedInterfacePtrState<Interface> State; |
mutable State internal_state_; |
- |
- DISALLOW_COPY_AND_ASSIGN(AssociatedInterfacePtr); |
}; |
// Creates an associated interface. The output |ptr| should be used locally |