Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a

mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

 // 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.
 
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/public/cpp/application/application_impl.h"
@@ skipping 74 matching lines @@
     view->RemoveObserver(this);
     delete this;
   }
 
   View* root_;
 
   DISALLOW_COPY_AND_ASSIGN(RootObserver);
 };
 
 ViewManagerClientImpl::ViewManagerClientImpl(ViewManagerDelegate* delegate,
-                                             Shell* shell)
-    : connected_(false), connection_id_(0), next_id_(1), delegate_(delegate) {
+                                             Shell* shell,
+                                             ScopedMessagePipeHandle handle,
+                                             bool delete_on_error)
+    : connected_(false),
+      connection_id_(0),
+      next_id_(1),
+      delegate_(delegate),
+      binding_(this, handle.Pass()),
+      service_(binding_.client()),
+      delete_on_error_(delete_on_error) {
 }
 
 ViewManagerClientImpl::~ViewManagerClientImpl() {
   std::vector<View*> non_owned;
   while (!views_.empty()) {
     IdToViewMap::iterator it = views_.begin();
     if (OwnsView(it->second->id())) {
       it->second->Destroy();
     } else {
       non_owned.push_back(it->second);
@@ skipping 85 matching lines @@
   ServiceProviderPtr sp;
   BindToProxy(new ServiceProviderImpl, &sp);
   Embed(url, view_id, sp.Pass());
 }
 
 void ViewManagerClientImpl::Embed(
     const String& url,
     Id view_id,
     ServiceProviderPtr service_provider) {
   DCHECK(connected_);
-  service_->Embed(url, view_id, service_provider.Pass(),
-                  ActionCompletedCallback());
+  service_->Embed(url, view_id,
+      MakeRequest<ServiceProvider>(service_provider.PassMessagePipe()),
+      ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::AddView(View* view) {
   DCHECK(views_.find(view->id()) == views_.end());
   views_[view->id()] = view;
 }
 
 void ViewManagerClientImpl::RemoveView(Id view_id) {
   IdToViewMap::iterator it = views_.find(view_id);
   if (it != views_.end())
@@ skipping 10 matching lines @@
 const std::vector<View*>& ViewManagerClientImpl::GetRoots() const {
   return roots_;
 }
 
 View* ViewManagerClientImpl::GetViewById(Id id) {
   IdToViewMap::const_iterator it = views_.find(id);
   return it != views_.end() ? it->second : NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ViewManagerClientImpl, InterfaceImpl overrides:
-
-void ViewManagerClientImpl::OnConnectionEstablished() {
-  service_ = client();
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // ViewManagerClientImpl, ViewManagerClient implementation:
 
 void ViewManagerClientImpl::OnEmbed(
     ConnectionSpecificId connection_id,
     const String& creator_url,
     ViewDataPtr root_data,
     InterfaceRequest<ServiceProvider> parent_services,
     ScopedMessagePipeHandle window_manager_pipe) {
   if (!connected_) {
     connected_ = true;
@@ skipping 137 matching lines @@
     FOR_EACH_OBSERVER(ViewObserver,
                       *ViewPrivate(focused).observers(),
                       OnViewFocusChanged(focused, blurred));
   }
 }
 
 void ViewManagerClientImpl::OnActiveWindowChanged(Id old_focused_window,
                                                   Id new_focused_window) {}
 
 ////////////////////////////////////////////////////////////////////////////////
+// OnConnectionError, private:
+void ViewManagerClientImpl::OnConnectionError() {
+  if (delete_on_error_)
+    delete this;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // ViewManagerClientImpl, private:
 
 void ViewManagerClientImpl::RemoveRoot(View* root) {
   std::vector<View*>::iterator it =
       std::find(roots_.begin(), roots_.end(), root);
   if (it != roots_.end())
     roots_.erase(it);
 }
 
 void ViewManagerClientImpl::OnActionCompleted(bool success) {
@@ skipping 10 matching lines @@
                     base::Unretained(this));
 }
 
 base::Callback<void(ErrorCode)>
     ViewManagerClientImpl::ActionCompletedCallbackWithErrorCode() {
   return base::Bind(&ViewManagerClientImpl::OnActionCompletedWithErrorCode,
                     base::Unretained(this));
 }
 
 }  // namespace mojo