diff options
| author | jam <jam@chromium.org> | 2015-05-14 15:56:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-14 22:56:18 +0000 |
| commit | 05a3de409c2653028aede6a467bb70c0addf57fc (patch) | |
| tree | 77329d790a38ff6aed7d8f9ae1d17e169887057a /extensions | |
| parent | 067d014b8f1918db09939aa765bdfa7576ab3d50 (diff) | |
| download | chromium_src-05a3de409c2653028aede6a467bb70c0addf57fc.zip chromium_src-05a3de409c2653028aede6a467bb70c0addf57fc.tar.gz chromium_src-05a3de409c2653028aede6a467bb70c0addf57fc.tar.bz2 | |
Fork the mojo shell interfaces used by Mandoline.
Per in-person discussions, as long as we have a fork of mojo shell we'll fork the interfaces.
I'll do third_party/mojo/src/mojo/public/java/application in a followup.
TBR=tsepez
Review URL: https://codereview.chromium.org/1139123006
Cr-Commit-Position: refs/heads/master@{#329965}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/BUILD.gn | 2 | ||||
| -rw-r--r-- | extensions/browser/mojo/DEPS | 3 | ||||
| -rw-r--r-- | extensions/browser/mojo/stash_backend_unittest.cc | 2 | ||||
| -rw-r--r-- | extensions/extensions_tests.gyp | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 903bb9c..8cfaea5 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -161,6 +161,7 @@ test("extensions_unittests") { "//extensions/renderer", "//extensions/strings", "//extensions/utility", + "//mojo/application/public/interfaces", "//mojo/environment:chromium", "//testing/gmock", "//testing/gtest", @@ -168,7 +169,6 @@ test("extensions_unittests") { "//third_party/mojo/src/mojo/edk/js", "//third_party/mojo/src/mojo/edk/system", "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/interfaces/application", ] if (is_win) { diff --git a/extensions/browser/mojo/DEPS b/extensions/browser/mojo/DEPS new file mode 100644 index 0000000..c6b0111 --- /dev/null +++ b/extensions/browser/mojo/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+mojo/application/public/interfaces", +] diff --git a/extensions/browser/mojo/stash_backend_unittest.cc b/extensions/browser/mojo/stash_backend_unittest.cc index de8abf4..ae14208 100644 --- a/extensions/browser/mojo/stash_backend_unittest.cc +++ b/extensions/browser/mojo/stash_backend_unittest.cc @@ -6,8 +6,8 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "extensions/browser/mojo/stash_backend.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" namespace extensions { namespace { diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp index 318bc2f..3e895ca 100644 --- a/extensions/extensions_tests.gyp +++ b/extensions/extensions_tests.gyp @@ -23,6 +23,7 @@ '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', '../device/serial/serial.gyp:device_serial', '../device/serial/serial.gyp:device_serial_test_util', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_environment_chromium', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -30,7 +31,6 @@ '../third_party/mojo/mojo_edk.gyp:mojo_js_lib', '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', - '../third_party/mojo/mojo_public.gyp:mojo_application_bindings', 'common/api/api.gyp:cast_channel_proto', 'extensions.gyp:extensions_browser', 'extensions.gyp:extensions_common', |