More work on ServiceProviderImpl.

apps/moterm/moterm_view.cc

 // Copyright 2015 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 "apps/moterm/moterm_view.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
@@ skipping 40 matching lines @@
       advance_width_(0),
       keypad_application_mode_(false) {
   // TODO(vtl): |service_provider_impl_|'s ctor doesn't like an invalid request,
   // so we have to conditionally, explicitly bind.
   if (service_provider_request.is_pending()) {
     // TODO(vtl): The connection context should probably be plumbed here, which
     // means that mojo::ui::ViewProviderApp::CreateView() should probably have a
     // connection context argument.
     service_provider_impl_.Bind(mojo::ConnectionContext(),
                                 service_provider_request.Pass());
-    service_provider_impl_.AddService<mojo::terminal::Terminal>(this);
+    service_provider_impl_.AddService<mojo::terminal::Terminal>([this](
+        const mojo::ConnectionContext& connection_context,
+        mojo::InterfaceRequest<mojo::terminal::Terminal> terminal_request) {
+      terminal_bindings_.AddBinding(this, terminal_request.Pass());
+    });
   }
 
   regular_typeface_ = skia::AdoptRef(SkTypeface::CreateFromStream(
       new SkMemoryStream(font_data::kDejaVuSansMonoRegular.data,
                          font_data::kDejaVuSansMonoRegular.size)));
 
   // TODO(vtl): This duplicates some code.
   SkPaint fg_paint;
   fg_paint.setTypeface(regular_typeface_.get());
   fg_paint.setTextSize(16);
@@ skipping 54 matching lines @@
 
 void MotermView::OnDestroyed() {
   DCHECK(!driver_);
   if (!on_closed_callback_.is_null()) {
     mojo::Closure callback;
     std::swap(callback, on_closed_callback_);
     callback.Run();
   }
 }
 
-void MotermView::Create(
-    const mojo::ConnectionContext& connection_context,
-    mojo::InterfaceRequest<mojo::terminal::Terminal> request) {
-  terminal_bindings_.AddBinding(this, request.Pass());
-}
-
 void MotermView::Connect(
     mojo::InterfaceRequest<mojo::files::File> terminal_file,
     bool force,
     const ConnectCallback& callback) {
   if (driver_) {
     // We already have a connection.
     if (force) {
       OnClosed();
     } else {
       // TODO(vtl): Is this error code right?
@@ skipping 184 matching lines @@
 
 void MotermView::OnKeyPressed(mojo::EventPtr key_event) {
   std::string input_sequence =
       GetInputSequenceForKeyPressedEvent(*key_event, keypad_application_mode_);
   if (input_sequence.empty())
     return;
 
   if (driver_)
     driver_->SendData(input_sequence.data(), input_sequence.size());
 }