summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorben <ben@chromium.org>2016-01-11 18:44:08 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-12 02:44:59 +0000
commit273c1e30241a8a5509ad9b307380ed8600ba82d8 (patch)
tree25da3f1a02f1f9d5f129ba8d794d20b51355a07b /docs
parent9c1122c7163411be938195ba546460ba54d33b00 (diff)
downloadchromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.zip
chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.gz
chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.bz2
Move mojo/application/public -> mojo/shell/public
TBR=sky@chromium.org http://crbug.com/575308 Review URL: https://codereview.chromium.org/1565343003 Cr-Commit-Position: refs/heads/master@{#368776}
Diffstat (limited to 'docs')
-rw-r--r--docs/mojo_in_chromium.md22
1 files changed, 11 insertions, 11 deletions
diff --git a/docs/mojo_in_chromium.md b/docs/mojo_in_chromium.md
index 0823e69..fe9fda3 100644
--- a/docs/mojo_in_chromium.md
+++ b/docs/mojo_in_chromium.md
@@ -336,7 +336,7 @@ interface ServiceProvider {
```
Definitions for these interfaces can be found in
-`/mojo/application/public/interfaces`. Also note that `mojo::URLRequest` is a
+`/mojo/shell/public/interfaces`. Also note that `mojo::URLRequest` is a
Mojo struct defined in
`/mojo/services/network/public/interfaces/url_loader.mojom`.
@@ -383,7 +383,7 @@ interface Application {
Of course, in Chromium and Mandoline environments this interface is obscured
from application code and applications should generally just implement
`mojo::ApplicationDelegate` (defined in
-`/mojo/application/public/cpp/application_delegate.h`.) We'll see a concrete
+`/mojo/shell/public/cpp/application_delegate.h`.) We'll see a concrete
example of this in the next section,
[Your First Mojo Application](#Your-First-Mojo-Application).
@@ -489,7 +489,7 @@ Let's update `main.cc` with the following contents:
```cpp
#include "components/hello/hello_app.h"
-#include "mojo/application/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/application_runner.h"
#include "third_party/mojo/src/mojo/public/c/system/main.h"
MojoResult MojoMain(MojoHandle shell_handle) {
@@ -535,8 +535,8 @@ mojom("interfaces") {
#include "base/macros.h"
#include "components/hello/public/interfaces/greeter.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
namespace hello {
@@ -569,7 +569,7 @@ class HelloApp : public mojo::ApplicationDelegate,
```cpp
#include "base/macros.h"
#include "components/hello/hello_app.h"
-#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/shell/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"
@@ -635,8 +635,8 @@ source_set("lib") {
deps = [
"//base",
"//components/hello/public/interfaces",
- "//mojo/application/public/cpp",
"//mojo/environment:chromium",
+ "//mojo/shell/public/cpp",
]
}
@@ -680,8 +680,8 @@ First let's introduce some test code:
#include "base/macros.h"
#include "base/run_loop.h"
#include "components/hello/public/interfaces/greeter.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
namespace hello {
namespace {
@@ -735,7 +735,7 @@ mojo_native_application("apptests") {
]
deps = [
"//base",
- "//mojo/application/public/cpp:test_support",
+ "//mojo/shell/public/cpp:test_support",
]
public_deps = [
"//components/hello/public/interfaces",
@@ -784,7 +784,7 @@ This is exploited by the definition of
`mojo::ApplicationConnection::ConnectToService<T>`, which uses `T::Name_` as the
name of the service to connect to. The type `T` in this context is inferred from
the `InterfacePtr<T>*` argument. You can inspect the definition of
-`ConnectToService` in `/mojo/application/public/cpp/application_connection.h`
+`ConnectToService` in `/mojo/shell/public/cpp/application_connection.h`
for additional clarity.
We could have instead written this code as: