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

Side by Side Diff: mojo/public/cpp/bindings/lib/control_message_proxy.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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h" 5 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "mojo/public/cpp/bindings/lib/message_builder.h" 13 #include "mojo/public/cpp/bindings/lib/message_builder.h"
14 #include "mojo/public/cpp/bindings/lib/serialization.h" 14 #include "mojo/public/cpp/bindings/lib/serialization.h"
15 #include "mojo/public/cpp/bindings/message.h" 15 #include "mojo/public/cpp/bindings/message.h"
16 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" 16 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
17 17
18 namespace mojo { 18 namespace mojo {
19 namespace internal { 19 namespace internal {
20 20
21 namespace { 21 namespace {
22 22
23 using RunCallback = base::Callback<void(QueryVersionResultPtr)>; 23 using RunCallback = Callback<void(QueryVersionResultPtr)>;
24 24
25 class RunResponseForwardToCallback : public MessageReceiver { 25 class RunResponseForwardToCallback : public MessageReceiver {
26 public: 26 public:
27 RunResponseForwardToCallback(const RunCallback& callback) 27 RunResponseForwardToCallback(const RunCallback& callback)
28 : callback_(callback) {} 28 : callback_(callback) {}
29 bool Accept(Message* message) override; 29 bool Accept(Message* message) override;
30 30
31 private: 31 private:
32 RunCallback callback_; 32 RunCallback callback_;
33 DISALLOW_COPY_AND_ASSIGN(RunResponseForwardToCallback); 33 DISALLOW_COPY_AND_ASSIGN(RunResponseForwardToCallback);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 MessageBuilder builder(kRunOrClosePipeMessageId, size); 81 MessageBuilder builder(kRunOrClosePipeMessageId, size);
82 82
83 RunOrClosePipeMessageParams_Data* params = nullptr; 83 RunOrClosePipeMessageParams_Data* params = nullptr;
84 Serialize<RunOrClosePipeMessageParamsPtr>(params_ptr, builder.buffer(), 84 Serialize<RunOrClosePipeMessageParamsPtr>(params_ptr, builder.buffer(),
85 &params, context); 85 &params, context);
86 params->EncodePointers(); 86 params->EncodePointers();
87 bool ok = receiver->Accept(builder.message()); 87 bool ok = receiver->Accept(builder.message());
88 ALLOW_UNUSED_LOCAL(ok); 88 ALLOW_UNUSED_LOCAL(ok);
89 } 89 }
90 90
91 void RunVersionCallback(const base::Callback<void(uint32_t)>& callback, 91 void RunVersionCallback(const Callback<void(uint32_t)>& callback,
92 QueryVersionResultPtr query_version_result) { 92 QueryVersionResultPtr query_version_result) {
93 callback.Run(query_version_result->version); 93 callback.Run(query_version_result->version);
94 } 94 }
95 95
96 } // namespace 96 } // namespace
97 97
98 ControlMessageProxy::ControlMessageProxy(MessageReceiverWithResponder* receiver) 98 ControlMessageProxy::ControlMessageProxy(MessageReceiverWithResponder* receiver)
99 : receiver_(receiver) { 99 : receiver_(receiver) {
100 } 100 }
101 101
102 void ControlMessageProxy::QueryVersion( 102 void ControlMessageProxy::QueryVersion(
103 const base::Callback<void(uint32_t)>& callback) { 103 const Callback<void(uint32_t)>& callback) {
104 SendRunMessage(receiver_, QueryVersion::New(), 104 SendRunMessage(receiver_, QueryVersion::New(),
105 base::Bind(&RunVersionCallback, callback), &context_); 105 base::Bind(&RunVersionCallback, callback), &context_);
106 } 106 }
107 107
108 void ControlMessageProxy::RequireVersion(uint32_t version) { 108 void ControlMessageProxy::RequireVersion(uint32_t version) {
109 RequireVersionPtr require_version(RequireVersion::New()); 109 RequireVersionPtr require_version(RequireVersion::New());
110 require_version->version = version; 110 require_version->version = version;
111 SendRunOrClosePipeMessage(receiver_, std::move(require_version), &context_); 111 SendRunOrClosePipeMessage(receiver_, std::move(require_version), &context_);
112 } 112 }
113 113
114 } // namespace internal 114 } // namespace internal
115 } // namespace mojo 115 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/cpp/bindings/lib/control_message_proxy.h ('k') | mojo/public/cpp/bindings/lib/interface_endpoint_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698