| Index: docs/mojo_in_chromium.md
|
| diff --git a/docs/mojo_in_chromium.md b/docs/mojo_in_chromium.md
|
| index b9919e22414936149e81fb477ef67bf7ee6843aa..96c925f4a853bcc48618900c34c09332a8e373ef 100644
|
| --- a/docs/mojo_in_chromium.md
|
| +++ b/docs/mojo_in_chromium.md
|
| @@ -93,7 +93,7 @@ or more handles to be transferred. A pipe's endpoints may live in the same
|
| process or in two different processes.
|
|
|
| Pipes are easy to create. The `mojo::MessagePipe` type (see
|
| -`/third_party/mojo/src/mojo/public/cpp/system/message_pipe.h`) provides a nice
|
| +`/mojo/public/cpp/system/message_pipe.h`) provides a nice
|
| class wrapper with each endpoint represented as a scoped handle type (see
|
| members `handle0` and `handle1` and the definition of
|
| `mojo::ScopedMessagePipeHandle`). In the same header you can find
|
| @@ -143,7 +143,7 @@ interface, such as the `frob::Frobinator` discussed above.
|
|
|
| #### `mojo::InterfacePtr<T>`
|
|
|
| -Defined in `/third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h`.
|
| +Defined in `/mojo/public/cpp/bindings/interface_ptr.h`.
|
|
|
| `mojo::InterfacePtr<T>` is a typed proxy for a service of type `T`, which can be
|
| bound to a message pipe endpoint. This class implements every interface method
|
| @@ -168,7 +168,7 @@ service pipes.
|
|
|
| #### `mojo::InterfaceRequest<T>`
|
|
|
| -Defined in `/third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h`.
|
| +Defined in `/mojo/public/cpp/bindings/interface_request.h`.
|
|
|
| `mojo::InterfaceRequest<T>` is a typed container for a message pipe endpoint
|
| that should _eventually_ be bound to a service implementation. An
|
| @@ -203,7 +203,7 @@ there's a convenient API function which does it for us.
|
| #### `mojo::GetProxy<T>`
|
|
|
| Defined in
|
| -`/third_party/mojo/src/mojo/public/cpp/bindings/interface`_request.h`.
|
| +`/mojo/public/cpp/bindings/interface`_request.h`.
|
|
|
| `mojo::GetProxy<T>` is the function you will most commonly use to create a new
|
| message pipe. Its signature is as follows:
|
| @@ -226,7 +226,7 @@ snippet:
|
|
|
| #### `mojo::Binding<T>`
|
|
|
| -Defined in `/third_party/mojo/src/mojo/public/cpp/bindings/binding.h`.
|
| +Defined in `/mojo/public/cpp/bindings/binding.h`.
|
|
|
| Binds one end of a message pipe to an implementation of service `T`. A message
|
| sent from the other end of the pipe will be read and, if successfully decoded as
|
| @@ -239,8 +239,8 @@ A common usage pattern looks something like this:
|
|
|
| ```
|
| #include "components/frob/public/interfaces/frobinator.mojom.h"
|
| -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
|
| -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
|
| +#include "mojo/public/cpp/bindings/binding.h"
|
| +#include "mojo/public/cpp/bindings/interface_request.h"
|
|
|
| class FrobinatorImpl : public frob::Frobinator {
|
| public:
|
| @@ -296,7 +296,7 @@ and one process hop before the service implementation is invoked.
|
|
|
| #### `mojo::StrongBinding<T>`
|
|
|
| -Defined in `third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h`.
|
| +Defined in `mojo/public/cpp/bindings/strong_binding.h`.
|
|
|
| `mojo::StrongBinding<T>` is just like `mojo::Binding<T>` with the exception that
|
| a `StrongBinding` takes ownership of the bound `T` instance. The instance is
|
| @@ -427,7 +427,7 @@ going to add the following files:
|
| **components/hello/main.cc**
|
| ```
|
| #include "base/logging.h"
|
| -#include "third_party/mojo/src/mojo/public/c/system/main.h"
|
| +#include "mojo/public/c/system/main.h"
|
|
|
| MojoResult MojoMain(MojoHandle shell_handle) {
|
| LOG(ERROR) << "Hello, world!";
|
| @@ -487,7 +487,7 @@ Let's update `main.cc` with the following contents:
|
| ```
|
| #include "components/hello/hello_app.h"
|
| #include "mojo/application/public/cpp/application_runner.h"
|
| -#include "third_party/mojo/src/mojo/public/c/system/main.h"
|
| +#include "mojo/public/c/system/main.h"
|
|
|
| MojoResult MojoMain(MojoHandle shell_handle) {
|
| mojo::ApplicationRunner runner(new hello::HelloApp);
|
| @@ -513,7 +513,7 @@ expects a response from the service.
|
|
|
| **components/hello/public/interfaces/BUILD.gn**
|
| ```
|
| -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
|
| +import("//mojo/public/tools/bindings/mojom.gni")
|
|
|
| mojom("interfaces") {
|
| sources = [
|
| @@ -563,8 +563,8 @@ class HelloApp : public mojo::ApplicationDelegate,
|
| #include "base/macros.h"
|
| #include "components/hello/hello_app.h"
|
| #include "mojo/application/public/cpp/application_connection.h"
|
| -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
|
| -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
|
| +#include "mojo/public/cpp/bindings/interface_request.h"
|
| +#include "mojo/public/cpp/bindings/strong_binding.h"
|
|
|
| namespace hello {
|
|
|
|
|