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

Unified Diff: ipc/mojo/ipc_mojo_bootstrap.cc

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 | « extensions/browser/mojo/stash_backend.cc ('k') | media/capture/video/scoped_result_callback.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/mojo/ipc_mojo_bootstrap.cc
diff --git a/ipc/mojo/ipc_mojo_bootstrap.cc b/ipc/mojo/ipc_mojo_bootstrap.cc
index b488dd5ab6148a9b63a347c9ae57b5cd5e54dc29..434f002744a5551fb719edb00ee013cadf3b9205 100644
--- a/ipc/mojo/ipc_mojo_bootstrap.cc
+++ b/ipc/mojo/ipc_mojo_bootstrap.cc
@@ -7,7 +7,6 @@
#include <stdint.h>
#include <utility>
-#include "base/callback.h"
#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
@@ -75,7 +74,7 @@
}
set_state(STATE_READY);
- bootstrap_.set_connection_error_handler(base::Closure());
+ bootstrap_.set_connection_error_handler(mojo::Closure());
delegate()->OnPipesAvailable(std::move(send_channel_),
std::move(receive_channel_request_), peer_pid);
}
@@ -94,7 +93,7 @@
void Init(mojom::ChannelAssociatedRequest receive_channel,
mojom::ChannelAssociatedPtrInfo send_channel,
int32_t peer_pid,
- const InitCallback& callback) override;
+ const mojo::Callback<void(int32_t)>& callback) override;
mojo::Binding<mojom::Bootstrap> binding_;
@@ -112,10 +111,10 @@
void MojoClientBootstrap::Init(mojom::ChannelAssociatedRequest receive_channel,
mojom::ChannelAssociatedPtrInfo send_channel,
int32_t peer_pid,
- const InitCallback& callback) {
+ const mojo::Callback<void(int32_t)>& callback) {
callback.Run(GetSelfPID());
set_state(STATE_READY);
- binding_.set_connection_error_handler(base::Closure());
+ binding_.set_connection_error_handler(mojo::Closure());
delegate()->OnPipesAvailable(std::move(send_channel),
std::move(receive_channel), peer_pid);
}
« no previous file with comments | « extensions/browser/mojo/stash_backend.cc ('k') | media/capture/video/scoped_result_callback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698