| Index: mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal.mojom.dart
 | 
| diff --git a/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal.mojom.dart
 | 
| index f8a608bb02320445cdfceecd1bbfe6e6f5df7ac9..5e112119c3ca060ce5e46876beea5d7062e3deba 100644
 | 
| --- a/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal.mojom.dart
 | 
| +++ b/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal.mojom.dart
 | 
| @@ -8,6 +8,8 @@ import 'dart:async';
 | 
|  
 | 
|  import 'package:mojo/bindings.dart' as bindings;
 | 
|  import 'package:mojo/core.dart' as core;
 | 
| +import 'package:mojo/mojo/mojom_types.mojom.dart' as mojom_types;
 | 
| +import 'package:mojo/mojo/service_describer.mojom.dart' as service_describer;
 | 
|  import 'package:mojo_services/mojo/files/file.mojom.dart' as file_mojom;
 | 
|  import 'package:mojo_services/mojo/files/types.mojom.dart' as types_mojom;
 | 
|  import 'package:mojo_services/mojo/terminal/terminal_client.mojom.dart' as terminal_client_mojom;
 | 
| @@ -87,6 +89,26 @@ class TerminalConnectParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _terminal_Terminal_Connect_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalConnectParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalFile')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..isInterfaceRequest = true
 | 
| +    ..identifier = '_file_File__'
 | 
| +    ..typeKey = '_file_File__'
 | 
| +  )),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Force')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.BOOL),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class TerminalConnectResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -158,6 +180,21 @@ class TerminalConnectResponseParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _terminal_Terminal_Connect_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalConnectResponseParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..identifier = '_types_Error__'
 | 
| +    ..typeKey = '_types_Error__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class TerminalConnectToClientParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -232,6 +269,25 @@ class TerminalConnectToClientParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _terminal_Terminal_ConnectToClient_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalConnectToClientParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalClient')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..identifier = '_terminal_client_TerminalClient__'
 | 
| +    ..typeKey = '_terminal_client_TerminalClient__'
 | 
| +  )),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Force')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.BOOL),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class TerminalConnectToClientResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -303,6 +359,21 @@ class TerminalConnectToClientResponseParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _terminal_Terminal_ConnectToClient_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalConnectToClientResponseParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..identifier = '_types_Error__'
 | 
| +    ..typeKey = '_types_Error__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class TerminalGetSizeParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -361,6 +432,12 @@ class TerminalGetSizeParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _terminal_Terminal_GetSize_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalGetSizeParams')
 | 
| +    ..fields = <mojom_types.StructField>[];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class TerminalGetSizeResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -450,6 +527,29 @@ class TerminalGetSizeResponseParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _terminal_Terminal_GetSize_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalGetSizeResponseParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..identifier = '_types_Error__'
 | 
| +    ..typeKey = '_types_Error__'
 | 
| +  )),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Rows')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.UINT32),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Columns')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.UINT32),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class TerminalSetSizeParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -535,6 +635,24 @@ class TerminalSetSizeParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _terminal_Terminal_SetSize_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalSetSizeParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Rows')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.UINT32),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Columns')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.UINT32),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Reset')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.BOOL),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class TerminalSetSizeResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -624,6 +742,30 @@ class TerminalSetSizeResponseParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _terminal_Terminal_SetSize_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalSetSizeResponseParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..identifier = '_types_Error__'
 | 
| +    ..typeKey = '_types_Error__'
 | 
| +  )),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Rows')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.UINT32),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Columns')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.UINT32),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
| +
 | 
|  const int kTerminal_connect_name = 0;
 | 
|  const int kTerminal_connectToClient_name = 1;
 | 
|  const int kTerminal_getSize_name = 2;
 | 
| @@ -632,6 +774,41 @@ const int kTerminal_setSize_name = 3;
 | 
|  const String TerminalName =
 | 
|        'mojo::terminal::Terminal';
 | 
|  
 | 
| +mojom_types.MojomInterface _terminal_Terminal__() {
 | 
| +  return new mojom_types.MojomInterface()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = "Terminal")
 | 
| +    ..interfaceName = "Terminal"
 | 
| +    ..methods = <int, mojom_types.MojomMethod>{
 | 
| +kTerminal_connect_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "Connect")
 | 
| +        ..ordinal = kTerminal_connect_name
 | 
| +        ..responseParams = _terminal_Terminal_Connect_ResponseParams__()..parameters = _terminal_Terminal_Connect_Params__(),kTerminal_connectToClient_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "ConnectToClient")
 | 
| +        ..ordinal = kTerminal_connectToClient_name
 | 
| +        ..responseParams = _terminal_Terminal_ConnectToClient_ResponseParams__()..parameters = _terminal_Terminal_ConnectToClient_Params__(),kTerminal_getSize_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "GetSize")
 | 
| +        ..ordinal = kTerminal_getSize_name
 | 
| +        ..responseParams = _terminal_Terminal_GetSize_ResponseParams__()..parameters = _terminal_Terminal_GetSize_Params__(),kTerminal_setSize_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "SetSize")
 | 
| +        ..ordinal = kTerminal_setSize_name
 | 
| +        ..responseParams = _terminal_Terminal_SetSize_ResponseParams__()..parameters = _terminal_Terminal_SetSize_Params__(),
 | 
| +    };
 | 
| +}
 | 
| +
 | 
| +class _TerminalServiceDescription extends service_describer.ServiceDescription {
 | 
| +  // Avoid infinite loop by overriding serviceDescription field.
 | 
| +  final service_describer.ServiceDescription serviceDescription = null;
 | 
| +dynamic getTopLevelInterface([Function responseFactory = null]) {
 | 
| +    return _terminal_Terminal__();
 | 
| +  }
 | 
| +  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
 | 
| +    return getAllMojomTypeDefinitions()[typeKey];
 | 
| +  }
 | 
| +  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
 | 
| +    return getAllMojomTypeDefinitions();
 | 
| +  }
 | 
| +}
 | 
| +
 | 
|  abstract class Terminal {
 | 
|    dynamic connect(Object terminalFile,bool force,[Function responseFactory = null]);
 | 
|    dynamic connectToClient(Object terminalClient,bool force,[Function responseFactory = null]);
 | 
| @@ -658,6 +835,9 @@ class TerminalProxyImpl extends bindings.Proxy {
 | 
|  
 | 
|    String get name => TerminalName;
 | 
|  
 | 
| +  service_describer.ServiceDescription get serviceDescription =>
 | 
| +    new _TerminalServiceDescription();
 | 
| +
 | 
|    void handleResponse(bindings.ServiceMessage message) {
 | 
|      switch (message.header.type) {
 | 
|        case kTerminal_connect_name:
 | 
| @@ -1019,6 +1199,119 @@ class TerminalStub extends bindings.Stub {
 | 
|    }
 | 
|  
 | 
|    int get version => 0;
 | 
| +
 | 
| +  service_describer.ServiceDescription get serviceDescription =>
 | 
| +    new _TerminalServiceDescription();
 | 
| +}
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +var _MojomDesc__ = _initDescriptions();
 | 
| +
 | 
| +Map<String, mojom_types.UserDefinedType> _initDescriptions() {
 | 
| +  var map = new Map<String, mojom_types.UserDefinedType>();
 | 
| +  
 | 
| +  map["_terminal_Terminal_Connect_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _terminal_Terminal_Connect_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_terminal_Terminal_Connect_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _terminal_Terminal_Connect_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_terminal_Terminal_ConnectToClient_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _terminal_Terminal_ConnectToClient_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_terminal_Terminal_ConnectToClient_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _terminal_Terminal_ConnectToClient_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_terminal_Terminal_GetSize_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _terminal_Terminal_GetSize_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_terminal_Terminal_GetSize_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _terminal_Terminal_GetSize_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_terminal_Terminal_SetSize_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _terminal_Terminal_SetSize_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_terminal_Terminal_SetSize_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _terminal_Terminal_SetSize_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_terminal_Terminal__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..interfaceType = _terminal_Terminal__();
 | 
| +
 | 
| +file_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
 | 
| +  map[s] = udt;
 | 
| +});
 | 
| +types_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
 | 
| +  map[s] = udt;
 | 
| +});
 | 
| +terminal_client_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
 | 
| +  map[s] = udt;
 | 
| +});
 | 
| +  return map;
 | 
| +}
 | 
| +
 | 
| +Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
 | 
| +  return _MojomDesc__;
 | 
|  }
 | 
|  
 | 
|  
 | 
| 
 |