summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-04-23 09:20:09 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 16:20:15 +0000
commitd866af3aee3eff86fcc93f24d77bef4425b80b5a (patch)
treea56f26a75a7809e7556e07b1a8cf09fd073bfe7d /media
parent29b6f6fa8785ed80c2fcf043bb0619f3f8b80065 (diff)
downloadchromium_src-d866af3aee3eff86fcc93f24d77bef4425b80b5a.zip
chromium_src-d866af3aee3eff86fcc93f24d77bef4425b80b5a.tar.gz
chromium_src-d866af3aee3eff86fcc93f24d77bef4425b80b5a.tar.bz2
Moves services implementations out of third_party/mojo_services
Most go into components/, with the exception of events and input_events. They are in ui/mojo now. R=ben@chromium.org, jam@chromium.org, jochen@chromium.org TBR=jochen@chromium.org BUG=479353 Review URL: https://codereview.chromium.org/1085233004 Cr-Commit-Position: refs/heads/master@{#326535}
Diffstat (limited to 'media')
-rw-r--r--media/mojo/interfaces/BUILD.gn2
-rw-r--r--media/mojo/interfaces/media_types.mojom2
-rw-r--r--media/mojo/services/BUILD.gn2
3 files changed, 3 insertions, 3 deletions
diff --git a/media/mojo/interfaces/BUILD.gn b/media/mojo/interfaces/BUILD.gn
index 4a0ca19..fabec42 100644
--- a/media/mojo/interfaces/BUILD.gn
+++ b/media/mojo/interfaces/BUILD.gn
@@ -14,6 +14,6 @@ mojom("interfaces") {
]
deps = [
- "//third_party/mojo_services/src/geometry/public/interfaces",
+ "//ui/mojo/geometry:interfaces",
]
}
diff --git a/media/mojo/interfaces/media_types.mojom b/media/mojo/interfaces/media_types.mojom
index fc14286..f23da86 100644
--- a/media/mojo/interfaces/media_types.mojom
+++ b/media/mojo/interfaces/media_types.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom";
+import "ui/mojo/geometry/geometry.mojom";
// See media/base/buffering_state.h for descriptions.
// Kept in sync with media::BufferingState via static_asserts.
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index 2a56e2e..c8ec687 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -33,7 +33,7 @@ source_set("converters") {
"//mojo/converters/geometry",
"//mojo/environment:chromium",
"//third_party/mojo/src/mojo/public/c/system:for_component",
- "//third_party/mojo_services/src/geometry/public/interfaces",
+ "//ui/mojo/geometry:interfaces",
]
}