| Index: mojo/public/cpp/bindings/binding_set.h
|
| diff --git a/mojo/public/cpp/bindings/binding_set.h b/mojo/public/cpp/bindings/binding_set.h
|
| index a22df5e05146bdef8af40551ee5c9556ac48d603..b1baca6a808dc3e6e637bbd408e7f424dfae828d 100644
|
| --- a/mojo/public/cpp/bindings/binding_set.h
|
| +++ b/mojo/public/cpp/bindings/binding_set.h
|
| @@ -10,6 +10,7 @@
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| +#include "base/callback.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| @@ -24,7 +25,7 @@ class BindingSet {
|
| BindingSet() {}
|
| ~BindingSet() { CloseAllBindings(); }
|
|
|
| - void set_connection_error_handler(const Closure& error_handler) {
|
| + void set_connection_error_handler(const base::Closure& error_handler) {
|
| error_handler_ = error_handler;
|
| }
|
|
|
| @@ -66,7 +67,7 @@ class BindingSet {
|
|
|
| ~Element() {}
|
|
|
| - void set_connection_error_handler(const Closure& error_handler) {
|
| + void set_connection_error_handler(const base::Closure& error_handler) {
|
| error_handler_ = error_handler;
|
| }
|
|
|
| @@ -77,7 +78,7 @@ class BindingSet {
|
| void Close() { binding_.Close(); }
|
|
|
| void OnConnectionError() {
|
| - Closure error_handler = error_handler_;
|
| + base::Closure error_handler = error_handler_;
|
| delete this;
|
| if (!error_handler.is_null())
|
| error_handler.Run();
|
| @@ -85,7 +86,7 @@ class BindingSet {
|
|
|
| private:
|
| Binding<Interface> binding_;
|
| - Closure error_handler_;
|
| + base::Closure error_handler_;
|
| base::WeakPtrFactory<Element> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Element);
|
| @@ -103,7 +104,7 @@ class BindingSet {
|
| error_handler_.Run();
|
| }
|
|
|
| - Closure error_handler_;
|
| + base::Closure error_handler_;
|
| std::vector<base::WeakPtr<Element>> bindings_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BindingSet);
|
|
|