diff options
| author | Colin Blundell <blundell@chromium.org> | 2015-01-19 13:17:50 +0100 |
|---|---|---|
| committer | Colin Blundell <blundell@chromium.org> | 2015-01-19 12:20:14 +0000 |
| commit | 835d018d323f35bd8d9b0d645caf180705b0a7da (patch) | |
| tree | fc84cfdcb2bba73f3edb5bfeb9fff7797a46e02e /mojo/services/native_viewport | |
| parent | 71f9904e069bac7cd87140ad9006890392b04ea2 (diff) | |
| download | chromium_src-835d018d323f35bd8d9b0d645caf180705b0a7da.zip chromium_src-835d018d323f35bd8d9b0d645caf180705b0a7da.tar.gz chromium_src-835d018d323f35bd8d9b0d645caf180705b0a7da.tar.bz2 | |
Update mojo sdk to rev b737c0531e299ad494725c518699843e76ff84f5
Incorporates changes from https://codereview.chromium.org/849133003/ to adapt
to API changes in surfaces and ConnectToApplication.
TBR=ben@chromium.org, jamesr@chromium.org
Review URL: https://codereview.chromium.org/858603002
Cr-Commit-Position: refs/heads/master@{#312096}
Diffstat (limited to 'mojo/services/native_viewport')
| -rw-r--r-- | mojo/services/native_viewport/public/interfaces/BUILD.gn | 10 | ||||
| -rw-r--r-- | mojo/services/native_viewport/public/interfaces/native_viewport.mojom | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/mojo/services/native_viewport/public/interfaces/BUILD.gn b/mojo/services/native_viewport/public/interfaces/BUILD.gn index 25ac003..0311564 100644 --- a/mojo/services/native_viewport/public/interfaces/BUILD.gn +++ b/mojo/services/native_viewport/public/interfaces/BUILD.gn @@ -10,10 +10,12 @@ mojom("interfaces") { "native_viewport.mojom", ] + import_dirs = [ get_path_info("../../../", "abspath") ] + public_deps = [ - "//mojo/services/geometry/public/interfaces", - "//mojo/services/gpu/public/interfaces", - "//mojo/services/input_events/public/interfaces", - "//mojo/services/surfaces/public/interfaces:surface_id", + "../../../geometry/public/interfaces", + "../../../gpu/public/interfaces", + "../../../input_events/public/interfaces", + "../../../surfaces/public/interfaces:surface_id", ] } diff --git a/mojo/services/native_viewport/public/interfaces/native_viewport.mojom b/mojo/services/native_viewport/public/interfaces/native_viewport.mojom index 4960051..72d3c9d 100644 --- a/mojo/services/native_viewport/public/interfaces/native_viewport.mojom +++ b/mojo/services/native_viewport/public/interfaces/native_viewport.mojom @@ -4,10 +4,10 @@ module mojo; -import "mojo/services/geometry/public/interfaces/geometry.mojom"; -import "mojo/services/gpu/public/interfaces/command_buffer.mojom"; -import "mojo/services/input_events/public/interfaces/input_events.mojom"; -import "mojo/services/surfaces/public/interfaces/surface_id.mojom"; +import "geometry/public/interfaces/geometry.mojom"; +import "gpu/public/interfaces/command_buffer.mojom"; +import "input_events/public/interfaces/input_events.mojom"; +import "surfaces/public/interfaces/surface_id.mojom"; struct ViewportMetrics { Size size; |