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

Unified Diff: services/service_manager/connect_params.h

Issue 2634493002: Revert of Perform InterfaceProviderSpec intersection in the ServiceManager (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | services/service_manager/public/cpp/interface_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/service_manager/connect_params.h
diff --git a/services/service_manager/connect_params.h b/services/service_manager/connect_params.h
index 8c8787a454c0cd2d815064bd29b6dbe527c0335a..a2104cd29a213368e79554d070c45ef0a4bf4a88 100644
--- a/services/service_manager/connect_params.h
+++ b/services/service_manager/connect_params.h
@@ -52,36 +52,11 @@
return std::move(pid_receiver_request_);
}
- void set_interface_request_info(
- const std::string& interface_name,
- mojo::ScopedMessagePipeHandle interface_pipe) {
- interface_name_ = interface_name;
- interface_pipe_ = std::move(interface_pipe);
- }
- const std::string& interface_name() const {
- return interface_name_;
- }
- bool HasInterfaceRequestInfo() const {
- return !interface_name_.empty() && interface_pipe_.is_valid();
- }
- mojo::ScopedMessagePipeHandle TakeInterfaceRequestPipe() {
- return std::move(interface_pipe_);
- }
-
void set_connect_callback(const mojom::Connector::ConnectCallback& value) {
connect_callback_ = value;
}
const mojom::Connector::ConnectCallback& connect_callback() const {
return connect_callback_;
- }
-
- void set_bind_interface_callback(
- const mojom::Connector::BindInterfaceCallback& callback) {
- bind_interface_callback_ = callback;
- }
- const mojom::Connector::BindInterfaceCallback&
- bind_interface_callback() const {
- return bind_interface_callback_;
}
private:
@@ -94,10 +69,7 @@
mojom::InterfaceProviderRequest remote_interfaces_;
mojom::ServicePtr service_;
mojom::PIDReceiverRequest pid_receiver_request_;
- std::string interface_name_;
- mojo::ScopedMessagePipeHandle interface_pipe_;
mojom::Connector::ConnectCallback connect_callback_;
- mojom::Connector::BindInterfaceCallback bind_interface_callback_;
DISALLOW_COPY_AND_ASSIGN(ConnectParams);
};
« no previous file with comments | « no previous file | services/service_manager/public/cpp/interface_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698