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

Unified Diff: mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h

Issue 2080513002: Deletes mojo::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/interface_ptr.h ('k') | mojo/public/cpp/bindings/lib/binding_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h
diff --git a/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h b/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h
index 8e015dcf012bf705f181a4103b8cd4028b68ad12..d5a965ccb5c2ffa90500fb9f909a5fcb76135f0f 100644
--- a/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h
+++ b/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h
@@ -12,13 +12,13 @@
#include <utility>
#include "base/bind.h"
+#include "base/callback_forward.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/single_thread_task_runner.h"
#include "mojo/public/cpp/bindings/associated_group.h"
#include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
-#include "mojo/public/cpp/bindings/callback.h"
#include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
#include "mojo/public/cpp/bindings/lib/interface_endpoint_client.h"
#include "mojo/public/cpp/bindings/lib/interface_id.h"
@@ -51,7 +51,7 @@ class AssociatedInterfacePtrState {
return endpoint_client_->interface_id();
}
- void QueryVersion(const Callback<void(uint32_t)>& callback) {
+ void QueryVersion(const base::Callback<void(uint32_t)>& callback) {
// Do a static cast in case the interface contains methods with the same
// name. It is safe to capture |this| because the callback won't be run
// after this object goes away.
@@ -108,7 +108,7 @@ class AssociatedInterfacePtrState {
return endpoint_client_ ? endpoint_client_->encountered_error() : false;
}
- void set_connection_error_handler(const Closure& error_handler) {
+ void set_connection_error_handler(const base::Closure& error_handler) {
DCHECK(endpoint_client_);
endpoint_client_->set_connection_error_handler(error_handler);
}
@@ -125,7 +125,7 @@ class AssociatedInterfacePtrState {
private:
using Proxy = typename Interface::Proxy_;
- void OnQueryVersion(const Callback<void(uint32_t)>& callback,
+ void OnQueryVersion(const base::Callback<void(uint32_t)>& callback,
uint32_t version) {
version_ = version;
callback.Run(version);
« no previous file with comments | « mojo/public/cpp/bindings/interface_ptr.h ('k') | mojo/public/cpp/bindings/lib/binding_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698