Dart: Refactors Proxies

mojo/dart/packages/mojo_services/lib/tracing/trace_provider_registry.mojom.dart

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 library trace_provider_registry_mojom;
 import 'dart:async';
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 import 'package:mojo_services/tracing/tracing.mojom.dart' as tracing_mojom;
@@ skipping 82 matching lines @@
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class TraceProviderRegistry {
   static const String serviceName = "tracing.TraceProviderRegistry";
   void registerTraceProvider(Object traceProvider);
 }
 
 
-class _TraceProviderRegistryProxyImpl extends bindings.Proxy {
-  _TraceProviderRegistryProxyImpl.fromEndpoint(
+class _TraceProviderRegistryProxyControl extends bindings.ProxyMessageHandler
+                                      implements bindings.ProxyControl {
+  _TraceProviderRegistryProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
-  _TraceProviderRegistryProxyImpl.fromHandle(core.MojoHandle handle) :
-      super.fromHandle(handle);
+  _TraceProviderRegistryProxyControl.fromHandle(
+      core.MojoHandle handle) : super.fromHandle(handle);
 
-  _TraceProviderRegistryProxyImpl.unbound() : super.unbound();
-
-  static _TraceProviderRegistryProxyImpl newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For _TraceProviderRegistryProxyImpl"));
-    return new _TraceProviderRegistryProxyImpl.fromEndpoint(endpoint);
-  }
+  _TraceProviderRegistryProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
-    new _TraceProviderRegistryServiceDescription();
+      new _TraceProviderRegistryServiceDescription();
 
+  String get serviceName => TraceProviderRegistry.serviceName;
+
+  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "_TraceProviderRegistryProxyImpl($superString)";
+    return "_TraceProviderRegistryProxyControl($superString)";
   }
 }
 
 
-class _TraceProviderRegistryProxyCalls implements TraceProviderRegistry {
-  _TraceProviderRegistryProxyImpl _proxyImpl;
+class TraceProviderRegistryProxy extends bindings.Proxy
+                              implements TraceProviderRegistry {
+  TraceProviderRegistryProxy.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint)
+      : super(new _TraceProviderRegistryProxyControl.fromEndpoint(endpoint));
 
-  _TraceProviderRegistryProxyCalls(this._proxyImpl);
-    void registerTraceProvider(Object traceProvider) {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _TraceProviderRegistryRegisterTraceProviderParams();
-      params.traceProvider = traceProvider;
-      _proxyImpl.sendMessage(params, _traceProviderRegistryMethodRegisterTraceProviderName);
-    }
-}
+  TraceProviderRegistryProxy.fromHandle(core.MojoHandle handle)
+      : super(new _TraceProviderRegistryProxyControl.fromHandle(handle));
 
+  TraceProviderRegistryProxy.unbound()
+      : super(new _TraceProviderRegistryProxyControl.unbound());
 
-class TraceProviderRegistryProxy implements bindings.ProxyBase {
-  final bindings.Proxy impl;
-  TraceProviderRegistry ptr;
-
-  TraceProviderRegistryProxy(_TraceProviderRegistryProxyImpl proxyImpl) :
-      impl = proxyImpl,
-      ptr = new _TraceProviderRegistryProxyCalls(proxyImpl);
-
-  TraceProviderRegistryProxy.fromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) :
-      impl = new _TraceProviderRegistryProxyImpl.fromEndpoint(endpoint) {
-    ptr = new _TraceProviderRegistryProxyCalls(impl);
-  }
-
-  TraceProviderRegistryProxy.fromHandle(core.MojoHandle handle) :
-      impl = new _TraceProviderRegistryProxyImpl.fromHandle(handle) {
-    ptr = new _TraceProviderRegistryProxyCalls(impl);
-  }
-
-  TraceProviderRegistryProxy.unbound() :
-      impl = new _TraceProviderRegistryProxyImpl.unbound() {
-    ptr = new _TraceProviderRegistryProxyCalls(impl);
+  static TraceProviderRegistryProxy newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For TraceProviderRegistryProxy"));
+    return new TraceProviderRegistryProxy.fromEndpoint(endpoint);
   }
 
   factory TraceProviderRegistryProxy.connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     TraceProviderRegistryProxy p = new TraceProviderRegistryProxy.unbound();
     s.connectToService(url, p, serviceName);
     return p;
   }
 
-  static TraceProviderRegistryProxy newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For TraceProviderRegistryProxy"));
-    return new TraceProviderRegistryProxy.fromEndpoint(endpoint);
-  }
 
-  String get serviceName => TraceProviderRegistry.serviceName;
-
-  Future close({bool immediate: false}) => impl.close(immediate: immediate);
-
-  Future responseOrError(Future f) => impl.responseOrError(f);
-
-  Future get errorFuture => impl.errorFuture;
-
-  int get version => impl.version;
-
-  Future<int> queryVersion() => impl.queryVersion();
-
-  void requireVersion(int requiredVersion) {
-    impl.requireVersion(requiredVersion);
-  }
-
-  String toString() {
-    return "TraceProviderRegistryProxy($impl)";
+  void registerTraceProvider(Object traceProvider) {
+    if (!ctrl.isBound) {
+      ctrl.proxyError("The Proxy is closed.");
+      return;
+    }
+    var params = new _TraceProviderRegistryRegisterTraceProviderParams();
+    params.traceProvider = traceProvider;
+    ctrl.sendMessage(params,
+        _traceProviderRegistryMethodRegisterTraceProviderName);
   }
 }
 
 
 class TraceProviderRegistryStub extends bindings.Stub {
   TraceProviderRegistry _impl;
 
   TraceProviderRegistryStub.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [TraceProviderRegistry impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
@@ skipping 68 matching lines @@
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _TraceProviderRegistryServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }