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

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

Issue 2080083002: Revert of Deletes mojo::Callback (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
« no previous file with comments | « mojo/public/cpp/bindings/binding.h ('k') | mojo/public/cpp/bindings/callback.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b1baca6a808dc3e6e637bbd408e7f424dfae828d..a22df5e05146bdef8af40551ee5c9556ac48d603 100644
--- a/mojo/public/cpp/bindings/binding_set.h
+++ b/mojo/public/cpp/bindings/binding_set.h
@@ -10,7 +10,6 @@
#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"
@@ -25,7 +24,7 @@
BindingSet() {}
~BindingSet() { CloseAllBindings(); }
- void set_connection_error_handler(const base::Closure& error_handler) {
+ void set_connection_error_handler(const Closure& error_handler) {
error_handler_ = error_handler;
}
@@ -67,7 +66,7 @@
~Element() {}
- void set_connection_error_handler(const base::Closure& error_handler) {
+ void set_connection_error_handler(const Closure& error_handler) {
error_handler_ = error_handler;
}
@@ -78,7 +77,7 @@
void Close() { binding_.Close(); }
void OnConnectionError() {
- base::Closure error_handler = error_handler_;
+ Closure error_handler = error_handler_;
delete this;
if (!error_handler.is_null())
error_handler.Run();
@@ -86,7 +85,7 @@
private:
Binding<Interface> binding_;
- base::Closure error_handler_;
+ Closure error_handler_;
base::WeakPtrFactory<Element> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(Element);
@@ -104,7 +103,7 @@
error_handler_.Run();
}
- base::Closure error_handler_;
+ Closure error_handler_;
std::vector<base::WeakPtr<Element>> bindings_;
DISALLOW_COPY_AND_ASSIGN(BindingSet);
« no previous file with comments | « mojo/public/cpp/bindings/binding.h ('k') | mojo/public/cpp/bindings/callback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698