Mojo: abstract interface implementation from generated Stub classes

mojo/examples/compositor_app/compositor_app.cc

 // Copyright 2013 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.
 
 #include <stdio.h>
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "mojo/common/bindings_support_impl.h"
 #include "mojo/examples/compositor_app/compositor_host.h"
@@ skipping 12 matching lines @@
 #endif
 #define SAMPLE_APP_EXPORT __declspec(dllexport)
 #else
 #define CDECL
 #define SAMPLE_APP_EXPORT __attribute__((visibility("default")))
 #endif
 
 namespace mojo {
 namespace examples {
 
-class SampleApp : public ShellClientStub {
+class SampleApp : public ShellClient {
  public:
   explicit SampleApp(ScopedMessagePipeHandle shell_handle)
-      : shell_(shell_handle.Pass()) {
-    shell_.SetPeer(this);
+      : shell_(shell_handle.Pass(), this) {
     mojo::ScopedMessagePipeHandle client_handle, native_viewport_handle;
     CreateMessagePipe(&client_handle, &native_viewport_handle);
     native_viewport_client_.reset(
         new NativeViewportClientImpl(native_viewport_handle.Pass()));
     mojo::AllocationScope scope;
     shell_->Connect("mojo:mojo_native_viewport_service", client_handle.Pass());
   }
 
   virtual void AcceptConnection(ScopedMessagePipeHandle handle) MOJO_OVERRIDE {
     NOTREACHED() << "SampleApp can't be connected to.";
   }
 
  private:
-  class NativeViewportClientImpl : public mojo::NativeViewportClientStub {
+  class NativeViewportClientImpl : public mojo::NativeViewportClient {
    public:
     explicit NativeViewportClientImpl(ScopedMessagePipeHandle viewport_handle)
-        : viewport_(viewport_handle.Pass()) {
-      viewport_.SetPeer(this);
+        : viewport_(viewport_handle.Pass(), this) {
       viewport_->Open();
       ScopedMessagePipeHandle gles2_handle;
       ScopedMessagePipeHandle gles2_client_handle;
       CreateMessagePipe(&gles2_handle, &gles2_client_handle);
 
       gles2_client_.reset(new GLES2ClientImpl(
             gles2_handle.Pass(),
             base::Bind(&NativeViewportClientImpl::DidCreateContext,
                        base::Unretained(this))));
       viewport_->CreateGLES2Context(gles2_client_handle.Pass());
@@ skipping 39 matching lines @@
   MojoGLES2Initialize();
 
   mojo::examples::SampleApp app(
       mojo::MakeScopedHandle(mojo::MessagePipeHandle(shell_handle)).Pass());
   loop.Run();
 
   MojoGLES2Terminate();
   mojo::BindingsSupport::Set(NULL);
   return MOJO_RESULT_OK;
 }