| Index: mojo/edk/embedder/multiprocess_embedder.h
|
| diff --git a/mojo/edk/embedder/embedder.h b/mojo/edk/embedder/multiprocess_embedder.h
|
| similarity index 80%
|
| copy from mojo/edk/embedder/embedder.h
|
| copy to mojo/edk/embedder/multiprocess_embedder.h
|
| index a7d37d6d012cb924cbb9d845dfbdf81a0a4c9db6..7a025400df2a275bbcd185d6bb40854c36e45f70 100644
|
| --- a/mojo/edk/embedder/embedder.h
|
| +++ b/mojo/edk/embedder/multiprocess_embedder.h
|
| @@ -1,12 +1,11 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| -#ifndef MOJO_EDK_EMBEDDER_EMBEDDER_H_
|
| -#define MOJO_EDK_EMBEDDER_EMBEDDER_H_
|
| +#ifndef MOJO_EDK_EMBEDDER_MULTIPROCESS_EMBEDDER_H_
|
| +#define MOJO_EDK_EMBEDDER_MULTIPROCESS_EMBEDDER_H_
|
|
|
| #include <functional>
|
| -#include <memory>
|
| #include <string>
|
|
|
| #include "mojo/edk/embedder/channel_info_forward.h"
|
| @@ -24,52 +23,8 @@ class PlatformHandleWatcher;
|
|
|
| namespace embedder {
|
|
|
| -struct Configuration;
|
| -class PlatformSupport;
|
| class ProcessDelegate;
|
|
|
| -// Basic configuration/initialization ------------------------------------------
|
| -
|
| -// |Init()| sets up the basic Mojo system environment, making the |Mojo...()|
|
| -// functions available and functional. This is never shut down (except in tests
|
| -// -- see test_embedder.h).
|
| -
|
| -// Returns the global configuration. In general, you should not need to change
|
| -// the configuration, but if you do you must do it before calling |Init()|.
|
| -Configuration* GetConfiguration();
|
| -
|
| -// Must be called first, or just after setting configuration parameters, to
|
| -// initialize the (global, singleton) system.
|
| -void Init(std::unique_ptr<PlatformSupport> platform_support);
|
| -
|
| -// Basic functions -------------------------------------------------------------
|
| -
|
| -// The functions in this section are available once |Init()| has been called.
|
| -
|
| -// Start waiting on the handle asynchronously. On success, |callback| will be
|
| -// called exactly once, when |handle| satisfies a signal in |signals| or it
|
| -// becomes known that it will never do so. |callback| will be executed on an
|
| -// arbitrary thread, so it must not call any Mojo system or embedder functions.
|
| -MojoResult AsyncWait(MojoHandle handle,
|
| - MojoHandleSignals signals,
|
| - const std::function<void(MojoResult)>& callback);
|
| -
|
| -// Creates a |MojoHandle| that wraps the given |PlatformHandle| (taking
|
| -// ownership of it). This |MojoHandle| can then, e.g., be passed through message
|
| -// pipes. Note: This takes ownership (and thus closes) |platform_handle| even on
|
| -// failure, which is different from what you'd expect from a Mojo API, but it
|
| -// makes for a more convenient embedder API.
|
| -MojoResult CreatePlatformHandleWrapper(
|
| - platform::ScopedPlatformHandle platform_handle,
|
| - MojoHandle* platform_handle_wrapper_handle);
|
| -
|
| -// Retrieves the |PlatformHandle| that was wrapped into a |MojoHandle| (using
|
| -// |CreatePlatformHandleWrapper()| above). Note that the |MojoHandle| must still
|
| -// be closed separately.
|
| -MojoResult PassWrappedPlatformHandle(
|
| - MojoHandle platform_handle_wrapper_handle,
|
| - platform::ScopedPlatformHandle* platform_handle);
|
| -
|
| // Initialialization/shutdown for interprocess communication (IPC) -------------
|
|
|
| // |InitIPCSupport()| sets up the subsystem for interprocess communication,
|
| @@ -240,4 +195,4 @@ void WillDestroyChannelSoon(ChannelInfo* channel_info);
|
| } // namespace embedder
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_EDK_EMBEDDER_EMBEDDER_H_
|
| +#endif // MOJO_EDK_EMBEDDER_MULTIPROCESS_EMBEDDER_H_
|
|
|