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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/frame_host/frame_mojo_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/frame_mojo_shell.h
diff --git a/content/browser/frame_host/frame_mojo_shell.h b/content/browser/frame_host/frame_mojo_shell.h
index dbb657b1b62310d59dbda5a27fb3f3ac8dcc26b3..ae66513d270f7a682b50425d83c8a2717371d71b 100644
--- a/content/browser/frame_host/frame_mojo_shell.h
+++ b/content/browser/frame_host/frame_mojo_shell.h
@@ -31,8 +31,8 @@ class FrameMojoShell : public mojo::shell::mojom::Shell {
// mojo::Shell:
void ConnectToApplication(
mojo::URLRequestPtr application_url,
- mojo::InterfaceRequest<mojo::InterfaceProvider> services,
- mojo::InterfaceProviderPtr exposed_services,
+ mojo::shell::mojom::InterfaceProviderRequest services,
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services,
mojo::shell::mojom::CapabilityFilterPtr filter,
const ConnectToApplicationCallback& callback) override;
void QuitApplication() override;
@@ -44,7 +44,8 @@ class FrameMojoShell : public mojo::shell::mojom::Shell {
// ServiceRegistry providing browser services to connected applications.
scoped_ptr<ServiceRegistryImpl> service_registry_;
- mojo::WeakBindingSet<mojo::InterfaceProvider> service_provider_bindings_;
+ mojo::WeakBindingSet<mojo::shell::mojom::InterfaceProvider>
+ service_provider_bindings_;
DISALLOW_COPY_AND_ASSIGN(FrameMojoShell);
};
« 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