Move shell interfaces into the shell.mojom namespace.

mojo/shell/application_manager.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_APPLICATION_MANAGER_H_
 #define MOJO_SHELL_APPLICATION_MANAGER_H_
 
 #include <map>
 #include <utility>
 #include <vector>
@@ skipping 80 matching lines @@
   void TerminateShellConnections();
 
   // Removes a ApplicationInstance when it encounters an error.
   void OnApplicationInstanceError(ApplicationInstance* instance);
 
   ApplicationInstance* GetApplicationInstance(const Identity& identity) const;
 
   void CreateInstanceForHandle(
       ScopedHandle channel,
       const GURL& url,
-      CapabilityFilterPtr filter,
+      mojom::CapabilityFilterPtr filter,
       InterfaceRequest<mojom::PIDReceiver> pid_receiver);
   void AddListener(mojom::ApplicationManagerListenerPtr listener);
   void GetRunningApplications(
       const Callback<void(Array<mojom::ApplicationInfoPtr>)>& callback);
 
   void ApplicationPIDAvailable(uint32_t id, base::ProcessId pid);
 
  private:
   using IdentityToInstanceMap = std::map<Identity, ApplicationInstance*>;
   using URLToLoaderMap = std::map<GURL, ApplicationLoader*>;
 
   // Takes the contents of |params| only when it returns true.
   bool ConnectToRunningApplication(
       scoped_ptr<ConnectToApplicationParams>* params);
 
-  InterfaceRequest<Application> CreateAndConnectToInstance(
+  InterfaceRequest<mojom::Application> CreateAndConnectToInstance(
       scoped_ptr<ConnectToApplicationParams> params,
       ApplicationInstance** instance);
-  InterfaceRequest<Application> CreateInstance(
+  InterfaceRequest<mojom::Application> CreateInstance(
       const Identity& target_id,
       const base::Closure& on_application_end,
       ApplicationInstance** resulting_instance);
 
   // Called once |fetcher| has found app. |params->app_url()| is the url of
   // the requested application before any mappings/resolution have been applied.
   // The corresponding URLRequest struct in |params| has been taken.
   void HandleFetchCallback(scoped_ptr<ConnectToApplicationParams> params,
                            scoped_ptr<Fetcher> fetcher);
 
-  void RunNativeApplication(InterfaceRequest<Application> application_request,
-                            bool start_sandboxed,
-                            scoped_ptr<Fetcher> fetcher,
-                            ApplicationInstance* instance,
-                            const base::FilePath& file_path,
-                            bool path_exists);
+  void RunNativeApplication(
+      InterfaceRequest<mojom::Application> application_request,
+      bool start_sandboxed,
+      scoped_ptr<Fetcher> fetcher,
+      ApplicationInstance* instance,
+      const base::FilePath& file_path,
+      bool path_exists);
 
   // Returns the appropriate loader for |url|, or the default loader if there is
   // no loader configured for the URL.
   ApplicationLoader* GetLoaderForURL(const GURL& url);
 
   void CleanupRunner(NativeRunner* runner);
 
   mojom::ApplicationInfoPtr CreateApplicationInfoForInstance(
       ApplicationInstance* instance) const;
 
   scoped_ptr<PackageManager> const package_manager_;
   // Loader management.
   // Loaders are chosen in the order they are listed here.
   URLToLoaderMap url_to_loader_;
   scoped_ptr<ApplicationLoader> default_loader_;
 
   IdentityToInstanceMap identity_to_instance_;
 
   WeakInterfacePtrSet<mojom::ApplicationManagerListener> listeners_;
 
   base::TaskRunner* task_runner_;
   scoped_ptr<NativeRunnerFactory> native_runner_factory_;
   std::vector<scoped_ptr<NativeRunner>> native_runners_;
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
-Shell::ConnectToApplicationCallback EmptyConnectCallback();
+mojom::Shell::ConnectToApplicationCallback EmptyConnectCallback();
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_APPLICATION_MANAGER_H_