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

Side by Side Diff: content/browser/frame_host/frame_mojo_shell.h

Issue 1734643003: Remove CapabilityFilter from Connect() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@13connector2
Patch Set: . Created 4 years, 10 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
« no previous file with comments | « no previous file | content/browser/frame_host/frame_mojo_shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "mojo/public/cpp/bindings/interface_request.h" 10 #include "mojo/public/cpp/bindings/interface_request.h"
(...skipping 21 matching lines...) Expand all
32 // mojo::Shell: 32 // mojo::Shell:
33 void GetConnector(mojo::shell::mojom::ConnectorRequest request) override; 33 void GetConnector(mojo::shell::mojom::ConnectorRequest request) override;
34 void QuitApplication() override; 34 void QuitApplication() override;
35 35
36 // mojo::Connector: 36 // mojo::Connector:
37 void Connect( 37 void Connect(
38 const mojo::String& application_url, 38 const mojo::String& application_url,
39 uint32_t user_id, 39 uint32_t user_id,
40 mojo::shell::mojom::InterfaceProviderRequest services, 40 mojo::shell::mojom::InterfaceProviderRequest services,
41 mojo::shell::mojom::InterfaceProviderPtr exposed_services, 41 mojo::shell::mojom::InterfaceProviderPtr exposed_services,
42 mojo::shell::mojom::CapabilityFilterPtr filter,
43 const mojo::shell::mojom::Connector::ConnectCallback& callback) override; 42 const mojo::shell::mojom::Connector::ConnectCallback& callback) override;
44 void Clone(mojo::shell::mojom::ConnectorRequest request) override; 43 void Clone(mojo::shell::mojom::ConnectorRequest request) override;
45 44
46 ServiceRegistryImpl* GetServiceRegistry(); 45 ServiceRegistryImpl* GetServiceRegistry();
47 46
48 RenderFrameHost* frame_host_; 47 RenderFrameHost* frame_host_;
49 mojo::WeakBindingSet<mojo::shell::mojom::Shell> bindings_; 48 mojo::WeakBindingSet<mojo::shell::mojom::Shell> bindings_;
50 mojo::WeakBindingSet<mojo::shell::mojom::Connector> connectors_; 49 mojo::WeakBindingSet<mojo::shell::mojom::Connector> connectors_;
51 50
52 // ServiceRegistry providing browser services to connected applications. 51 // ServiceRegistry providing browser services to connected applications.
53 scoped_ptr<ServiceRegistryImpl> service_registry_; 52 scoped_ptr<ServiceRegistryImpl> service_registry_;
54 mojo::WeakBindingSet<mojo::shell::mojom::InterfaceProvider> 53 mojo::WeakBindingSet<mojo::shell::mojom::InterfaceProvider>
55 service_provider_bindings_; 54 service_provider_bindings_;
56 55
57 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); 56 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell);
58 }; 57 };
59 58
60 } // namespace content 59 } // namespace content
61 60
62 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ 61 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/frame_mojo_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698