diff options
author | ben <ben@chromium.org> | 2016-01-11 18:44:08 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-12 02:44:59 +0000 |
commit | 273c1e30241a8a5509ad9b307380ed8600ba82d8 (patch) | |
tree | 25da3f1a02f1f9d5f129ba8d794d20b51355a07b /mash/example | |
parent | 9c1122c7163411be938195ba546460ba54d33b00 (diff) | |
download | chromium_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 'mash/example')
8 files changed, 13 insertions, 13 deletions
diff --git a/mash/example/views_examples/BUILD.gn b/mash/example/views_examples/BUILD.gn index c250718..6758400 100644 --- a/mash/example/views_examples/BUILD.gn +++ b/mash/example/views_examples/BUILD.gn @@ -19,11 +19,11 @@ mojo_native_application("views_examples") { deps = [ "//base", "//components/mus/public/interfaces", - "//mojo/application/public/cpp", - "//mojo/application/public/cpp:sources", "//mojo/converters/geometry", "//mojo/public/cpp/bindings", "//mojo/services/tracing/public/cpp", + "//mojo/shell/public/cpp", + "//mojo/shell/public/cpp:sources", "//skia", "//ui/gfx", "//ui/gfx/geometry", diff --git a/mash/example/views_examples/main.cc b/mash/example/views_examples/main.cc index 27c727bb..534382e 100644 --- a/mash/example/views_examples/main.cc +++ b/mash/example/views_examples/main.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "mash/example/views_examples/views_examples_application_delegate.h" -#include "mojo/application/public/cpp/application_runner.h" #include "mojo/public/c/system/main.h" +#include "mojo/shell/public/cpp/application_runner.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner(new ViewsExamplesApplicationDelegate); diff --git a/mash/example/views_examples/views_examples_application_delegate.cc b/mash/example/views_examples/views_examples_application_delegate.cc index cf5f46f..092d6f0 100644 --- a/mash/example/views_examples/views_examples_application_delegate.cc +++ b/mash/example/views_examples/views_examples_application_delegate.cc @@ -4,8 +4,8 @@ #include "mash/example/views_examples/views_examples_application_delegate.h" -#include "mojo/application/public/cpp/application_connection.h" -#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/shell/public/cpp/application_connection.h" +#include "mojo/shell/public/cpp/application_impl.h" #include "ui/views/examples/example_base.h" #include "ui/views/examples/examples_window.h" #include "ui/views/mus/aura_init.h" diff --git a/mash/example/views_examples/views_examples_application_delegate.h b/mash/example/views_examples/views_examples_application_delegate.h index 47fb91a..040343c 100644 --- a/mash/example/views_examples/views_examples_application_delegate.h +++ b/mash/example/views_examples/views_examples_application_delegate.h @@ -7,8 +7,8 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "mojo/application/public/cpp/application_delegate.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" +#include "mojo/shell/public/cpp/application_delegate.h" namespace views { class AuraInit; diff --git a/mash/example/window_type_launcher/BUILD.gn b/mash/example/window_type_launcher/BUILD.gn index 2602af1..627af2a 100644 --- a/mash/example/window_type_launcher/BUILD.gn +++ b/mash/example/window_type_launcher/BUILD.gn @@ -22,14 +22,14 @@ executable("window_type_launcher") { "//base", "//base:base_static", "//components/mus/public/interfaces", - "//mojo/application/public/cpp", - "//mojo/application/public/interfaces", "//mojo/common:common_base", "//mojo/converters/geometry", "//mojo/message_pump", "//mojo/public/cpp/bindings", "//mojo/runner:init", "//mojo/runner/child:lib", + "//mojo/shell/public/cpp", + "//mojo/shell/public/interfaces", "//skia", "//third_party/mojo/src/mojo/edk/system", "//ui/aura", diff --git a/mash/example/window_type_launcher/main.cc b/mash/example/window_type_launcher/main.cc index 826820a..27d8cd3 100644 --- a/mash/example/window_type_launcher/main.cc +++ b/mash/example/window_type_launcher/main.cc @@ -14,11 +14,11 @@ #include "base/threading/thread.h" #include "build/build_config.h" #include "mash/example/window_type_launcher/window_type_launcher.h" -#include "mojo/application/public/cpp/application_impl.h" -#include "mojo/application/public/interfaces/application.mojom.h" #include "mojo/message_pump/message_pump_mojo.h" #include "mojo/runner/child/runner_connection.h" #include "mojo/runner/init.h" +#include "mojo/shell/public/cpp/application_impl.h" +#include "mojo/shell/public/interfaces/application.mojom.h" #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h" diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc index 920f715..06812a6 100644 --- a/mash/example/window_type_launcher/window_type_launcher.cc +++ b/mash/example/window_type_launcher/window_type_launcher.cc @@ -6,9 +6,9 @@ #include "base/macros.h" #include "base/strings/utf_string_conversions.h" -#include "mojo/application/public/cpp/application_connection.h" -#include "mojo/application/public/cpp/application_impl.h" #include "mojo/converters/geometry/geometry_type_converters.h" +#include "mojo/shell/public/cpp/application_connection.h" +#include "mojo/shell/public/cpp/application_impl.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" diff --git a/mash/example/window_type_launcher/window_type_launcher.h b/mash/example/window_type_launcher/window_type_launcher.h index fc07222..6e91df8 100644 --- a/mash/example/window_type_launcher/window_type_launcher.h +++ b/mash/example/window_type_launcher/window_type_launcher.h @@ -7,7 +7,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/shell/public/cpp/application_delegate.h" namespace views { class AuraInit; |