Dart: Refactor Stubs

mojo/dart/packages/mojo_services/lib/mojo/navigation.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 navigation_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/mojo/url_request.mojom.dart' as url_request_mojom;
@@ skipping 306 matching lines @@
       responseFactory(null);
 }
 
 abstract class NavigatorHost {
   static const String serviceName = "mojo::NavigatorHost";
   void requestNavigate(Target target, url_request_mojom.UrlRequest request);
   void requestNavigateHistory(int delta);
   void didNavigateLocally(String url);
 }
 
-
-class _NavigatorHostProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _NavigatorHostProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _NavigatorHostProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _NavigatorHostProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _NavigatorHostProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _NavigatorHostServiceDescription();
 
   String get serviceName => NavigatorHost.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 "_NavigatorHostProxyControl($superString)";
   }
 }
 
-
-class NavigatorHostProxy extends bindings.Proxy
-                              implements NavigatorHost {
+class NavigatorHostProxy
+    extends bindings.Proxy
+    implements NavigatorHost {
   NavigatorHostProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _NavigatorHostProxyControl.fromEndpoint(endpoint));
 
   NavigatorHostProxy.fromHandle(core.MojoHandle handle)
       : super(new _NavigatorHostProxyControl.fromHandle(handle));
 
   NavigatorHostProxy.unbound()
       : super(new _NavigatorHostProxyControl.unbound());
 
@@ skipping 37 matching lines @@
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _NavigatorHostDidNavigateLocallyParams();
     params.url = url;
     ctrl.sendMessage(params,
         _navigatorHostMethodDidNavigateLocallyName);
   }
 }
 
-
-class NavigatorHostStub extends bindings.Stub {
+class _NavigatorHostStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<NavigatorHost> {
   NavigatorHost _impl;
 
-  NavigatorHostStub.fromEndpoint(
+  _NavigatorHostStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [NavigatorHost impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  NavigatorHostStub.fromHandle(
+  _NavigatorHostStubControl.fromHandle(
       core.MojoHandle handle, [NavigatorHost impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  NavigatorHostStub.unbound([this._impl]) : super.unbound();
-
-  static NavigatorHostStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For NavigatorHostStub"));
-    return new NavigatorHostStub.fromEndpoint(endpoint);
-  }
+  _NavigatorHostStubControl.unbound([this._impl]) : super.unbound();
 
 
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
       return bindings.ControlMessageHandler.handleMessage(this,
                                                           0,
                                                           message);
     }
     if (_impl == null) {
@@ skipping 34 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "NavigatorHostStub($superString)";
+    return "_NavigatorHostStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _NavigatorHostServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class NavigatorHostStub
+    extends bindings.Stub<NavigatorHost>
+    implements NavigatorHost {
+  NavigatorHostStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [NavigatorHost impl])
+      : super(new _NavigatorHostStubControl.fromEndpoint(endpoint, impl));
+
+  NavigatorHostStub.fromHandle(
+      core.MojoHandle handle, [NavigatorHost impl])
+      : super(new _NavigatorHostStubControl.fromHandle(handle, impl));
+
+  NavigatorHostStub.unbound([NavigatorHost impl])
+      : super(new _NavigatorHostStubControl.unbound(impl));
+
+  static NavigatorHostStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For NavigatorHostStub"));
+    return new NavigatorHostStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _NavigatorHostStubControl.serviceDescription;
+
+
+  void requestNavigate(Target target, url_request_mojom.UrlRequest request) {
+    return impl.requestNavigate(target, request);
+  }
+  void requestNavigateHistory(int delta) {
+    return impl.requestNavigateHistory(delta);
+  }
+  void didNavigateLocally(String url) {
+    return impl.didNavigateLocally(url);
+  }
+}
+