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

Unified Diff: content/browser/mojo/mojo_shell_context.cc

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
Index: content/browser/mojo/mojo_shell_context.cc
diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc
index 7b6c26642bd1375c955eb3a7a43b4f56bbbf00cc..286f937dfbf1450d124f347fba0dddf6ff583ba9 100644
--- a/content/browser/mojo/mojo_shell_context.cc
+++ b/content/browser/mojo/mojo_shell_context.cc
@@ -158,8 +158,8 @@ class MojoShellContext::Proxy {
void ConnectToApplication(
const GURL& url,
const GURL& requestor_url,
- mojo::InterfaceRequest<mojo::InterfaceProvider> request,
- mojo::InterfaceProviderPtr exposed_services,
+ mojo::shell::mojom::InterfaceProviderRequest request,
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services,
const mojo::shell::CapabilityFilter& filter,
const mojo::shell::mojom::Shell::ConnectToApplicationCallback& callback) {
if (task_runner_ == base::ThreadTaskRunnerHandle::Get()) {
@@ -260,8 +260,8 @@ MojoShellContext::~MojoShellContext() {
void MojoShellContext::ConnectToApplication(
const GURL& url,
const GURL& requestor_url,
- mojo::InterfaceRequest<mojo::InterfaceProvider> request,
- mojo::InterfaceProviderPtr exposed_services,
+ mojo::shell::mojom::InterfaceProviderRequest request,
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services,
const mojo::shell::CapabilityFilter& filter,
const mojo::shell::mojom::Shell::ConnectToApplicationCallback& callback) {
proxy_.Get()->ConnectToApplication(url, requestor_url, std::move(request),
@@ -272,8 +272,8 @@ void MojoShellContext::ConnectToApplication(
void MojoShellContext::ConnectToApplicationOnOwnThread(
const GURL& url,
const GURL& requestor_url,
- mojo::InterfaceRequest<mojo::InterfaceProvider> request,
- mojo::InterfaceProviderPtr exposed_services,
+ mojo::shell::mojom::InterfaceProviderRequest request,
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services,
const mojo::shell::CapabilityFilter& filter,
const mojo::shell::mojom::Shell::ConnectToApplicationCallback& callback) {
scoped_ptr<mojo::shell::ConnectToApplicationParams> params(
« no previous file with comments | « content/browser/mojo/mojo_shell_context.h ('k') | content/browser/service_worker/embedded_worker_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698