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 /device | |
| 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 'device')
| -rw-r--r-- | device/devices_app/BUILD.gn | 8 | ||||
| -rw-r--r-- | device/devices_app/DEPS | 2 | ||||
| -rw-r--r-- | device/devices_app/devices_app.cc | 4 | ||||
| -rw-r--r-- | device/devices_app/devices_app.h | 4 | ||||
| -rw-r--r-- | device/devices_app/devices_apptest.cc | 4 | ||||
| -rw-r--r-- | device/devices_app/main.cc | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/device/devices_app/BUILD.gn b/device/devices_app/BUILD.gn index 2601cf2..f189e6b 100644 --- a/device/devices_app/BUILD.gn +++ b/device/devices_app/BUILD.gn @@ -29,8 +29,8 @@ source_set("lib") { public_deps = [ "//base", - "//mojo/application/public/cpp", - "//mojo/application/public/interfaces", + "//mojo/shell/public/cpp", + "//mojo/shell/public/interfaces", ] } @@ -43,7 +43,7 @@ if (!is_component_build) { deps = [ "//base", "//device/devices_app/public/cpp:factory", - "//mojo/application/public/cpp", + "//mojo/shell/public/cpp", ] public_deps = [ @@ -62,7 +62,7 @@ if (!is_component_build) { deps = [ "//base", - "//mojo/application/public/cpp:test_support", + "//mojo/shell/public/cpp:test_support", ] public_deps = [ diff --git a/device/devices_app/DEPS b/device/devices_app/DEPS index 8fbdc29..7256f77 100644 --- a/device/devices_app/DEPS +++ b/device/devices_app/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+mojo/application/public", + "+mojo/shell/public", "+mojo/common", ] diff --git a/device/devices_app/devices_app.cc b/device/devices_app/devices_app.cc index 7c392ad..0279629 100644 --- a/device/devices_app/devices_app.cc +++ b/device/devices_app/devices_app.cc @@ -17,9 +17,9 @@ #include "device/core/device_client.h" #include "device/devices_app/usb/device_manager_impl.h" #include "device/usb/usb_service.h" -#include "mojo/application/public/cpp/application_connection.h" -#include "mojo/application/public/cpp/application_impl.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/shell/public/cpp/application_connection.h" +#include "mojo/shell/public/cpp/application_impl.h" #include "url/gurl.h" namespace device { diff --git a/device/devices_app/devices_app.h b/device/devices_app/devices_app.h index f561929..3c6a838 100644 --- a/device/devices_app/devices_app.h +++ b/device/devices_app/devices_app.h @@ -11,8 +11,8 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.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 mojo { class ApplicationImpl; diff --git a/device/devices_app/devices_apptest.cc b/device/devices_app/devices_apptest.cc index b6b1503..e2d2a33 100644 --- a/device/devices_app/devices_apptest.cc +++ b/device/devices_app/devices_apptest.cc @@ -10,8 +10,8 @@ #include "base/run_loop.h" #include "device/devices_app/devices_app.h" #include "device/devices_app/usb/public/interfaces/device_manager.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 device { namespace { diff --git a/device/devices_app/main.cc b/device/devices_app/main.cc index 3541552..a43d8ff 100644 --- a/device/devices_app/main.cc +++ b/device/devices_app/main.cc @@ -4,9 +4,9 @@ #include "base/sequenced_task_runner.h" #include "device/devices_app/public/cpp/devices_app_factory.h" -#include "mojo/application/public/cpp/application_delegate.h" -#include "mojo/application/public/cpp/application_runner.h" #include "mojo/public/c/system/main.h" +#include "mojo/shell/public/cpp/application_delegate.h" +#include "mojo/shell/public/cpp/application_runner.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner( |