Move shell interfaces into the shell.mojom namespace.

mojo/shell/public/cpp/lib/service_registry.h

 // Copyright 2014 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.
 
 #ifndef MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
 #define MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
 
 #include <stdint.h>
 
 #include <set>
@@ skipping 18 matching lines @@
   // an application to expose to another application. If this set contains only
   // the string value "*" all interfaces may be exposed.
   ServiceRegistry(const std::string& connection_url,
                   const std::string& remote_url,
                   uint32_t remote_id,
                   ServiceProviderPtr remote_services,
                   InterfaceRequest<ServiceProvider> local_services,
                   const std::set<std::string>& allowed_interfaces);
   ~ServiceRegistry() override;
 
-  Shell::ConnectToApplicationCallback GetConnectToApplicationCallback();
+  shell::mojom::Shell::ConnectToApplicationCallback
+      GetConnectToApplicationCallback();
 
   // ApplicationConnection overrides.
   void SetServiceConnector(ServiceConnector* service_connector) override;
   bool SetServiceConnectorForName(ServiceConnector* service_connector,
                                   const std::string& interface_name) override;
   const std::string& GetConnectionURL() override;
   const std::string& GetRemoteApplicationURL() override;
   ServiceProvider* GetServiceProvider() override;
   ServiceProvider* GetLocalServiceProvider() override;
   void SetRemoteServiceProviderConnectionErrorHandler(
@@ skipping 28 matching lines @@
   std::vector<Closure> remote_id_callbacks_;
   base::WeakPtrFactory<ServiceRegistry> weak_factory_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceRegistry);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_