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

Unified Diff: services/shell/public/cpp/interface_registry.h

Issue 2215133002: Change signature of OnConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: . Created 4 years, 4 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 | « services/shell/public/cpp/connection.h ('k') | services/shell/public/cpp/lib/connection_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/public/cpp/interface_registry.h
diff --git a/services/shell/public/cpp/interface_registry.h b/services/shell/public/cpp/interface_registry.h
index ab62a8c154c1e405bc6f99881c42789859bad26f..e1cc51a26f29e809fcbea50d46801d8d6f6c5bcd 100644
--- a/services/shell/public/cpp/interface_registry.h
+++ b/services/shell/public/cpp/interface_registry.h
@@ -13,6 +13,8 @@
#include "base/callback.h"
#include "base/memory/ptr_util.h"
#include "mojo/public/cpp/bindings/binding.h"
+#include "services/shell/public/cpp/capabilities.h"
+#include "services/shell/public/cpp/identity.h"
#include "services/shell/public/cpp/lib/callback_binder.h"
#include "services/shell/public/cpp/lib/interface_factory_binder.h"
#include "services/shell/public/interfaces/interface_provider.mojom.h"
@@ -64,12 +66,13 @@ class InterfaceRegistry : public mojom::InterfaceProvider {
DISALLOW_COPY_AND_ASSIGN(TestApi);
};
- // Construct with a Connection (which may be null), and create an
- // InterfaceProvider pipe, the client end of which may be obtained by calling
- // TakeClientHandle(). If |connection| is non-null, the Mojo Shell's
- // rules filtering which interfaces are allowed to be exposed to clients are
- // imposed on this registry. If null, they are not.
- explicit InterfaceRegistry(Connection* connection);
+ // Construct an InterfaceRegistry with no filtering rules applied.
+ InterfaceRegistry();
+
+ // Construct an InterfaceRegistry with filtering rules as specified in
+ // |capability_request| applied.
+ InterfaceRegistry(const Identity& remote_identity,
+ const CapabilityRequest& capability_request);
~InterfaceRegistry() override;
// Sets a default handler for incoming interface requests which are allowed by
@@ -143,13 +146,18 @@ class InterfaceRegistry : public mojom::InterfaceProvider {
bool SetInterfaceBinderForName(std::unique_ptr<InterfaceBinder> binder,
const std::string& name);
+ // Returns true if |remote_identity_| is allowed to bind |interface_name|,
+ // according to capability policy.
+ bool CanBindRequestForInterface(const std::string& interface_name) const;
+
mojom::InterfaceProviderRequest pending_request_;
mojo::Binding<mojom::InterfaceProvider> binding_;
- Connection* connection_;
+ const Identity remote_identity_;
+ const CapabilityRequest capability_request_;
+ const bool allow_all_interfaces_;
NameToInterfaceBinderMap name_to_binder_;
-
Binder default_binder_;
bool is_paused_ = false;
« no previous file with comments | « services/shell/public/cpp/connection.h ('k') | services/shell/public/cpp/lib/connection_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698