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

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

Issue 1686223002: Move InterfaceProvider into the shell::mojom namespace like the rest of the shell interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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/common/weak_binding_set.h" 10 #include "mojo/common/weak_binding_set.h"
(...skipping 13 matching lines...) Expand all
24 explicit FrameMojoShell(RenderFrameHost* frame_host); 24 explicit FrameMojoShell(RenderFrameHost* frame_host);
25 ~FrameMojoShell() override; 25 ~FrameMojoShell() override;
26 26
27 void BindRequest( 27 void BindRequest(
28 mojo::InterfaceRequest<mojo::shell::mojom::Shell> shell_request); 28 mojo::InterfaceRequest<mojo::shell::mojom::Shell> shell_request);
29 29
30 private: 30 private:
31 // mojo::Shell: 31 // mojo::Shell:
32 void ConnectToApplication( 32 void ConnectToApplication(
33 mojo::URLRequestPtr application_url, 33 mojo::URLRequestPtr application_url,
34 mojo::InterfaceRequest<mojo::InterfaceProvider> services, 34 mojo::shell::mojom::InterfaceProviderRequest services,
35 mojo::InterfaceProviderPtr exposed_services, 35 mojo::shell::mojom::InterfaceProviderPtr exposed_services,
36 mojo::shell::mojom::CapabilityFilterPtr filter, 36 mojo::shell::mojom::CapabilityFilterPtr filter,
37 const ConnectToApplicationCallback& callback) override; 37 const ConnectToApplicationCallback& callback) override;
38 void QuitApplication() override; 38 void QuitApplication() override;
39 39
40 ServiceRegistryImpl* GetServiceRegistry(); 40 ServiceRegistryImpl* GetServiceRegistry();
41 41
42 RenderFrameHost* frame_host_; 42 RenderFrameHost* frame_host_;
43 mojo::WeakBindingSet<mojo::shell::mojom::Shell> bindings_; 43 mojo::WeakBindingSet<mojo::shell::mojom::Shell> bindings_;
44 44
45 // ServiceRegistry providing browser services to connected applications. 45 // ServiceRegistry providing browser services to connected applications.
46 scoped_ptr<ServiceRegistryImpl> service_registry_; 46 scoped_ptr<ServiceRegistryImpl> service_registry_;
47 mojo::WeakBindingSet<mojo::InterfaceProvider> service_provider_bindings_; 47 mojo::WeakBindingSet<mojo::shell::mojom::InterfaceProvider>
48 service_provider_bindings_;
48 49
49 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); 50 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell);
50 }; 51 };
51 52
52 } // namespace content 53 } // namespace content
53 54
54 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ 55 #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