Move shell interfaces into the shell.mojom namespace.

content/browser/mojo/mojo_shell_context.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/mojo/mojo_shell_context.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 48 matching lines @@
 
 // The default loader to use for all applications. This does nothing but drop
 // the Application request.
 class DefaultApplicationLoader : public mojo::shell::ApplicationLoader {
  public:
   DefaultApplicationLoader() {}
   ~DefaultApplicationLoader() override {}
 
  private:
   // mojo::shell::ApplicationLoader:
-  void Load(
-      const GURL& url,
-      mojo::InterfaceRequest<mojo::Application> application_request) override {}
+  void Load(const GURL& url,
+            mojo::InterfaceRequest<mojo::shell::mojom::Application> request)
+                override {}
 
   DISALLOW_COPY_AND_ASSIGN(DefaultApplicationLoader);
 };
 
 // This launches a utility process and forwards the Load request the
 // ProcessControl service there. The utility process is sandboxed iff
 // |use_sandbox| is true.
 class UtilityProcessLoader : public mojo::shell::ApplicationLoader {
  public:
   UtilityProcessLoader(const base::string16& process_name, bool use_sandbox)
       : process_name_(process_name), use_sandbox_(use_sandbox) {}
   ~UtilityProcessLoader() override {}
 
  private:
   // mojo::shell::ApplicationLoader:
-  void Load(
-      const GURL& url,
-      mojo::InterfaceRequest<mojo::Application> application_request) override {
+  void Load(const GURL& url,
+            mojo::InterfaceRequest<mojo::shell::mojom::Application> request)
+                override {
     ProcessControlPtr process_control;
     auto process_request = mojo::GetProxy(&process_control);
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             base::Bind(&StartUtilityProcessOnIOThread,
                                        base::Passed(&process_request),
                                        process_name_, use_sandbox_));
-    process_control->LoadApplication(url.spec(), std::move(application_request),
+    process_control->LoadApplication(url.spec(), std::move(request),
                                      base::Bind(&OnApplicationLoaded, url));
   }
 
   const base::string16 process_name_;
   const bool use_sandbox_;
 
   DISALLOW_COPY_AND_ASSIGN(UtilityProcessLoader);
 };
 
 // Request ProcessControl from GPU process host. Must be called on IO thread.
@@ skipping 15 matching lines @@
 }
 
 // Forwards the load request to the GPU process.
 class GpuProcessLoader : public mojo::shell::ApplicationLoader {
  public:
   GpuProcessLoader() {}
   ~GpuProcessLoader() override {}
 
  private:
   // mojo::shell::ApplicationLoader:
-  void Load(
-      const GURL& url,
-      mojo::InterfaceRequest<mojo::Application> application_request) override {
+  void Load(const GURL& url,
+            mojo::InterfaceRequest<mojo::shell::mojom::Application> request)
+                override {
     ProcessControlPtr process_control;
     auto process_request = mojo::GetProxy(&process_control);
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&RequestGpuProcessControl, base::Passed(&process_request)));
-    process_control->LoadApplication(url.spec(), std::move(application_request),
+    process_control->LoadApplication(url.spec(), std::move(request),
                                      base::Bind(&OnApplicationLoaded, url));
   }
 
   DISALLOW_COPY_AND_ASSIGN(GpuProcessLoader);
 };
 
 }  // namespace
 
 // Thread-safe proxy providing access to the shell context from any thread.
 class MojoShellContext::Proxy {
  public:
   Proxy(MojoShellContext* shell_context)
       : shell_context_(shell_context),
         task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
 
   ~Proxy() {}
 
   void ConnectToApplication(
       const GURL& url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> request,
       mojo::ServiceProviderPtr exposed_services,
       const mojo::shell::CapabilityFilter& filter,
-      const mojo::Shell::ConnectToApplicationCallback& callback) {
+      const mojo::shell::mojom::Shell::ConnectToApplicationCallback& callback) {
     if (task_runner_ == base::ThreadTaskRunnerHandle::Get()) {
       if (shell_context_) {
         shell_context_->ConnectToApplicationOnOwnThread(
             url, requestor_url, std::move(request), std::move(exposed_services),
             filter, callback);
       }
     } else {
       // |shell_context_| outlives the main MessageLoop, so it's safe for it to
       // be unretained here.
       task_runner_->PostTask(
@@ skipping 81 matching lines @@
 MojoShellContext::~MojoShellContext() {
 }
 
 // static
 void MojoShellContext::ConnectToApplication(
     const GURL& url,
     const GURL& requestor_url,
     mojo::InterfaceRequest<mojo::ServiceProvider> request,
     mojo::ServiceProviderPtr exposed_services,
     const mojo::shell::CapabilityFilter& filter,
-    const mojo::Shell::ConnectToApplicationCallback& callback) {
+    const mojo::shell::mojom::Shell::ConnectToApplicationCallback& callback) {
   proxy_.Get()->ConnectToApplication(url, requestor_url, std::move(request),
                                      std::move(exposed_services), filter,
                                      callback);
 }
 
 void MojoShellContext::ConnectToApplicationOnOwnThread(
     const GURL& url,
     const GURL& requestor_url,
     mojo::InterfaceRequest<mojo::ServiceProvider> request,
     mojo::ServiceProviderPtr exposed_services,
     const mojo::shell::CapabilityFilter& filter,
-    const mojo::Shell::ConnectToApplicationCallback& callback) {
+    const mojo::shell::mojom::Shell::ConnectToApplicationCallback& callback) {
   scoped_ptr<mojo::shell::ConnectToApplicationParams> params(
       new mojo::shell::ConnectToApplicationParams);
   params->set_source(
       mojo::shell::Identity(requestor_url, std::string(),
                             mojo::shell::GetPermissiveCapabilityFilter()));
   params->SetTarget(mojo::shell::Identity(url, std::string(), filter));
   params->set_services(std::move(request));
   params->set_exposed_services(std::move(exposed_services));
   params->set_on_application_end(base::Bind(&base::DoNothing));
   params->set_connect_callback(callback);
   application_manager_->ConnectToApplication(std::move(params));
 }
 
 }  // namespace content