Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: mojo/public/bindings/tests/sample_service.mojom

Issue 159983003: Fix a bug with mojom imports where 2 imports with the same namespace would (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 import "sample_import.mojom" 5 import "sample_import.mojom"
6 import "sample_import2.mojom"
6 7
7 module sample { 8 module sample {
8 9
9 enum BarType { 10 enum BarType {
10 BAR_VERTICAL = 1 << 0, 11 BAR_VERTICAL = 1 << 0,
11 BAR_HORIZONTAL = (1 << 1) + 0, 12 BAR_HORIZONTAL = (1 << 1) + 0,
12 BAR_BOTH = BAR_VERTICAL | BAR_HORIZONTAL, 13 BAR_BOTH = BAR_VERTICAL | BAR_HORIZONTAL,
13 BAR_INVALID 14 BAR_INVALID
14 }; 15 };
15 16
(...skipping 24 matching lines...) Expand all
40 int32 age @2; 41 int32 age @2;
41 string[] names = ["Jim"] @1; 42 string[] names = ["Jim"] @1;
42 int32 height = 6*12 @3; 43 int32 height = 6*12 @3;
43 }; 44 };
44 45
45 struct DefaultsTest { 46 struct DefaultsTest {
46 sample.DefaultsTestInner[] people = [{32, ["Bob", "Bobby"]}] @1; 47 sample.DefaultsTestInner[] people = [{32, ["Bob", "Bobby"]}] @1;
47 uint8[] data = [1, 2, 3] @2; 48 uint8[] data = [1, 2, 3] @2;
48 imported.Point point = {7, 15} @3; 49 imported.Point point = {7, 15} @3;
49 int32[] shape_masks = [1 << imported.SHAPE_RECTANGLE] @4; 50 int32[] shape_masks = [1 << imported.SHAPE_RECTANGLE] @4;
51 imported.Thing thing = {imported.SHAPE_RECTANGLE, imported.COLOR_RED};
50 }; 52 };
51 53
52 interface Port { 54 interface Port {
53 void PostMessage(string message_text @0) @0; 55 void PostMessage(string message_text @0) @0;
54 }; 56 };
55 57
56 [Peer=ServiceClient] 58 [Peer=ServiceClient]
57 interface Service { 59 interface Service {
58 enum BazOptions { 60 enum BazOptions {
59 BAZ_REGULAR = 0, 61 BAZ_REGULAR = 0,
60 BAZ_EXTRA 62 BAZ_EXTRA
61 }; 63 };
62 void Frobinate(Foo foo @0, int32 baz @1, Port port @2) @0; 64 void Frobinate(Foo foo @0, int32 baz @1, Port port @2) @0;
63 }; 65 };
64 66
65 [Peer=Service] 67 [Peer=Service]
66 interface ServiceClient { 68 interface ServiceClient {
67 void DidFrobinate(int32 result @0) @0; 69 void DidFrobinate(int32 result @0) @0;
68 }; 70 };
69 71
70 } 72 }
OLDNEW
« no previous file with comments | « mojo/public/bindings/tests/sample_import2.mojom ('k') | mojo/public/bindings/tests/sample_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698