Index: content/child/process_control_impl.h |
diff --git a/content/utility/utility_process_control_impl.h b/content/child/process_control_impl.h |
similarity index 63% |
copy from content/utility/utility_process_control_impl.h |
copy to content/child/process_control_impl.h |
index dcc0a4d6179a1b1cddeabe616183a999a0aecb30..a2c87bd8b5f211fd5f9a32ceff531c32a1e31bd8 100644 |
--- a/content/utility/utility_process_control_impl.h |
+++ b/content/child/process_control_impl.h |
@@ -2,13 +2,12 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef UTILITY_PROCESS_CONTROL_IMPL_H_ |
-#define UTILITY_PROCESS_CONTROL_IMPL_H_ |
+#ifndef CONTENT_CHILD_PROCESS_CONTROL_IMPL_H_ |
+#define CONTENT_CHILD_PROCESS_CONTROL_IMPL_H_ |
#include <map> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "content/common/process_control.mojom.h" |
#include "mojo/application/public/interfaces/application.mojom.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" |
@@ -23,26 +22,30 @@ class ApplicationLoader; |
namespace content { |
-// Implementation of the ProcessControl interface. Exposed to the browser via |
-// the utility process's ServiceRegistry. |
-class UtilityProcessControlImpl : public ProcessControl { |
+// Default implementation of the ProcessControl interface. |
+class ProcessControlImpl : public ProcessControl { |
public: |
- UtilityProcessControlImpl(); |
- ~UtilityProcessControlImpl() override; |
+ ProcessControlImpl(); |
+ ~ProcessControlImpl() override; |
using URLToLoaderMap = std::map<GURL, mojo::shell::ApplicationLoader*>; |
+ // Registers Mojo applications loaders for URLs. |
+ virtual void RegisterApplicationLoaders( |
+ URLToLoaderMap* url_to_loader_map) = 0; |
+ |
// ProcessControl: |
void LoadApplication(const mojo::String& url, |
mojo::InterfaceRequest<mojo::Application> request, |
const LoadApplicationCallback& callback) override; |
private: |
+ bool has_registered_loaders_ = false; |
URLToLoaderMap url_to_loader_map_; |
- DISALLOW_COPY_AND_ASSIGN(UtilityProcessControlImpl); |
+ DISALLOW_COPY_AND_ASSIGN(ProcessControlImpl); |
}; |
} // namespace content |
-#endif // UTILITY_PROCESS_CONTROL_IMPL_H_ |
+#endif // CONTENT_CHILD_PROCESS_CONTROL_IMPL_H_ |