Rename shell.mojom to connector.mojom, ApplicationManager to Shell

mojo/shell/application_manager.h

Index: mojo/shell/application_manager.h
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h
deleted file mode 100644
index dd7a7128e383700b479a0e71136f370571eaf67d..0000000000000000000000000000000000000000
--- a/mojo/shell/application_manager.h
+++ /dev/null
@@ -1,205 +0,0 @@
-// 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 <vector>
-
-#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/public/cpp/bindings/interface_ptr_set.h"
-#include "mojo/services/package_manager/package_manager.h"
-#include "mojo/services/package_manager/public/interfaces/shell_resolver.mojom.h"
-#include "mojo/shell/connect_params.h"
-#include "mojo/shell/identity.h"
-#include "mojo/shell/loader.h"
-#include "mojo/shell/native_runner.h"
-#include "mojo/shell/public/cpp/interface_factory.h"
-#include "mojo/shell/public/cpp/shell_client.h"
-#include "mojo/shell/public/interfaces/application_manager.mojom.h"
-#include "mojo/shell/public/interfaces/interface_provider.mojom.h"
-#include "mojo/shell/public/interfaces/shell.mojom.h"
-#include "mojo/shell/public/interfaces/shell_client.mojom.h"
-#include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
-
-namespace base {
-class FilePath;
-class SequencedWorkerPool;
-}
-
-namespace mojo {
-class ShellConnection;
-namespace shell {
-
-class ApplicationManager : public ShellClient {
- public:
-  // API for testing.
-  class TestAPI {
-   public:
-    explicit TestAPI(ApplicationManager* manager);
-    ~TestAPI();
-
-    // Returns true if there is a Instance for this name.
-    bool HasRunningInstanceForName(const std::string& name) const;
-   private:
-    ApplicationManager* manager_;
-
-    DISALLOW_COPY_AND_ASSIGN(TestAPI);
-  };
-
-  // |native_runner_factory| is an instance of an object capable of vending
-  // implementations of NativeRunner, e.g. for in or out-of-process execution.
-  // See native_runner.h and RunNativeApplication().
-  // |file_task_runner| provides access to a thread to perform file copy
-  // operations on. This may be null only in testing environments where
-  // applications are loaded via Loader implementations.
-  ApplicationManager(
-      scoped_ptr<NativeRunnerFactory> native_runner_factory,
-      base::TaskRunner* file_task_runner,
-      scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog);
-  ~ApplicationManager() override;
-
-  // Provide a callback to be notified whenever an instance is destroyed.
-  // Typically the creator of the ApplicationManager will use this to determine
-  // when some set of instances it created are destroyed, so it can shut down.
-  void SetInstanceQuitCallback(base::Callback<void(const Identity&)> callback);
-
-  // Completes a connection between a source and target application as defined
-  // by |params|, exchanging InterfaceProviders between them. If no existing
-  // instance of the target application is running, one will be loaded.
-  void Connect(scoped_ptr<ConnectParams> params);
-
-  // Creates a new Instance identified as |name|. This is intended for use by
-  // the ApplicationManager's embedder to register itself with the shell. The
-  // name is never resolved and there must not be an existing instance
-  // associated with it. This must only be called once.
-  mojom::ShellClientRequest InitInstanceForEmbedder(const std::string& name);
-
-  // Sets the default Loader to be used if not overridden by SetLoaderForName().
-  void set_default_loader(scoped_ptr<Loader> loader) {
-    default_loader_ = std::move(loader);
-  }
-
-  // Sets a Loader to be used for a specific name.
-  void SetLoaderForName(scoped_ptr<Loader> loader, const std::string& name);
-
- private:
-  class Instance;
-
-  using IdentityToInstanceMap = std::map<Identity, Instance*>;
-  using NameToLoaderMap = std::map<std::string, Loader*>;
-  using IdentityToShellClientFactoryMap =
-      std::map<Identity, mojom::ShellClientFactoryPtr>;
-
-  // ShellClient:
-  bool AcceptConnection(Connection* connection) override;
-
-  void InitPackageManager(
-      scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog);
-
-  // Destroys all Shell-ends of connections established with Applications.
-  // Applications connected by this ApplicationManager will observe pipe errors
-  // and have a chance to shutdown.
-  void TerminateShellConnections();
-
-  // Removes a Instance when it encounters an error.
-  void OnInstanceError(Instance* instance);
-
-  Instance* GetExistingInstance(const Identity& identity) const;
-
-  void NotifyPIDAvailable(uint32_t id, base::ProcessId pid);
-
-  // Attempt to complete the connection requested by |params| by connecting to
-  // an existing instance. If there is an existing instance, |params| is taken,
-  // and this function returns true.
-  bool ConnectToExistingInstance(scoped_ptr<ConnectParams>* params);
-
-  Instance* CreateInstance(const Identity& target_id,
-                           mojom::ShellClientRequest* request);
-
-  // Called from the instance implementing mojom::ApplicationManager. |user_id|
-  // must be resolved by the instance (i.e. must not be
-  // mojom::Connector::kUserInherit).
-  void CreateInstanceForFactory(
-      mojom::ShellClientFactoryPtr factory,
-      const String& name,
-      uint32_t user_id,
-      mojom::CapabilityFilterPtr filter,
-      mojom::PIDReceiverRequest pid_receiver);
-  // Called from the instance implementing mojom::ApplicationManager.
-  void AddInstanceListener(mojom::InstanceListenerPtr listener);
-
-  void CreateShellClient(const Identity& source,
-                         const Identity& shell_client_factory,
-                         const std::string& name,
-                         mojom::ShellClientRequest request);
-  // Returns a running ShellClientFactory for |shell_client_factory_identity|,
-  // if there is not one running one is started for |source_identity|.
-  mojom::ShellClientFactory* GetShellClientFactory(
-      const Identity& shell_client_factory_identity,
-      const Identity& source_identity);
-  void OnShellClientFactoryLost(const Identity& which);;
-
-  // Callback when remote PackageManager resolves mojo:foo to mojo:bar.
-  // |params| are the params passed to Connect().
-  // |resolved_name| is the mojo: name identifying the physical package
-  // application.
-  // |file_url| is the resolved file:// URL of the physical package.
-  // |base_filter| is the CapabilityFilter the requested application should be
-  // run with, from its manifest.
-  void OnGotResolvedName(scoped_ptr<ConnectParams> params,
-                         const String& resolved_name,
-                         const String& resolved_qualifier,
-                         mojom::CapabilityFilterPtr base_filter,
-                         const String& file_url);
-
-  // Tries to load |target| with an Loader. Returns true if one was registered
-  // and it was loaded, in which case |request| is taken.
-  bool LoadWithLoader(const Identity& target,
-                      mojom::ShellClientRequest* request);
-
-  // Returns the appropriate loader for |name|, or the default loader if there
-  // is no loader configured for the name.
-  Loader* GetLoaderForName(const std::string& name);
-
-  void CleanupRunner(NativeRunner* runner);
-
-  package_manager::mojom::ShellResolverPtr shell_resolver_;
-
-  // Loader management.
-  // Loaders are chosen in the order they are listed here.
-  NameToLoaderMap name_to_loader_;
-  scoped_ptr<Loader> default_loader_;
-
-  IdentityToInstanceMap identity_to_instance_;
-
-  IdentityToShellClientFactoryMap shell_client_factories_;
-  // Counter used to assign ids to content handlers.
-  uint32_t shell_client_factory_id_counter_;
-
-  // The Instance created by the shell embedder, if any.
-  Instance* embedder_instance_ = nullptr;
-
-  InterfacePtrSet<mojom::InstanceListener> instance_listeners_;
-
-  base::Callback<void(const Identity&)> instance_quit_callback_;
-  base::TaskRunner* file_task_runner_;
-  scoped_ptr<NativeRunnerFactory> native_runner_factory_;
-  std::vector<scoped_ptr<NativeRunner>> native_runners_;
-  scoped_ptr<ShellConnection> shell_connection_;
-  base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
-};
-
-mojom::Connector::ConnectCallback EmptyConnectCallback();
-
-}  // namespace shell
-}  // namespace mojo
-
-#endif  // MOJO_SHELL_APPLICATION_MANAGER_H_