Update mojo sdk to rev cfc99316100efdfa7d53d83f9e07f1d4d3765c21

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 76 matching lines @@
   }
 
   View* root_;
 
   DISALLOW_COPY_AND_ASSIGN(RootObserver);
 };
 
 ViewManagerClientImpl::ViewManagerClientImpl(ViewManagerDelegate* delegate,
                                              Shell* shell)
     : connected_(false), connection_id_(0), next_id_(1), delegate_(delegate) {
-  InterfacePtr<ServiceProvider> sp;
-  shell->ConnectToApplication("mojo:window_manager", GetProxy(&sp));
-  ConnectToService(sp.get(), &window_manager_);
-  window_manager_.set_client(this);
 }
 
 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 52 matching lines @@
 
 void ViewManagerClientImpl::SetSurfaceId(Id view_id, SurfaceIdPtr surface_id) {
   DCHECK(connected_);
   if (surface_id.is_null())
     return;
   service_->SetViewSurfaceId(
       view_id, surface_id.Pass(), ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::SetFocus(Id view_id) {
+  // In order for us to get here we had to have exposed a view, which implies we
+  // got a connection.
+  DCHECK(window_manager_.get());
   window_manager_->FocusWindow(view_id, ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::SetVisible(Id view_id, bool visible) {
   DCHECK(connected_);
   service_->SetViewVisibility(view_id, visible, ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::SetProperty(
     Id view_id,
@@ skipping 55 matching lines @@
   service_ = client();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ViewManagerClientImpl, ViewManagerClient implementation:
 
 void ViewManagerClientImpl::OnEmbed(
     ConnectionSpecificId connection_id,
     const String& creator_url,
     ViewDataPtr root_data,
-    InterfaceRequest<ServiceProvider> service_provider) {
+    InterfaceRequest<ServiceProvider> parent_services,
+    ScopedMessagePipeHandle window_manager_pipe) {
   if (!connected_) {
     connected_ = true;
     connection_id_ = connection_id;
     creator_url_ = String::From(creator_url);
   } else {
     DCHECK_EQ(connection_id_, connection_id);
     DCHECK_EQ(creator_url_, creator_url);
   }
 
   // A new root must not already exist as a root or be contained by an existing
   // hierarchy visible to this view manager.
   View* root = AddViewToViewManager(this, NULL, root_data);
   roots_.push_back(root);
   root->AddObserver(new RootObserver(root));
 
   ServiceProviderImpl* exported_services = nullptr;
   scoped_ptr<ServiceProvider> remote;
 
-  if (service_provider.is_pending()) {
+  if (parent_services.is_pending()) {
     // BindToRequest() binds the lifetime of |exported_services| to the pipe.
     exported_services = new ServiceProviderImpl;
-    BindToRequest(exported_services, &service_provider);
+    BindToRequest(exported_services, &parent_services);
     remote.reset(exported_services->CreateRemoteServiceProvider());
   }
+  window_manager_.Bind(window_manager_pipe.Pass());
+  window_manager_.set_client(this);
   delegate_->OnEmbed(this, root, exported_services, remote.Pass());
 }
 
 void ViewManagerClientImpl::OnViewBoundsChanged(Id view_id,
                                                 RectPtr old_bounds,
                                                 RectPtr new_bounds) {
   View* view = GetViewById(view_id);
   ViewPrivate(view).LocalSetBounds(*old_bounds, *new_bounds);
 }
 
@@ skipping 70 matching lines @@
   View* view = GetViewById(view_id);
   if (view) {
     FOR_EACH_OBSERVER(ViewObserver,
                       *ViewPrivate(view).observers(),
                       OnViewInputEvent(view, event));
   }
   ack_callback.Run();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ViewManagerClientImpl, WindowManagerClient2 implementation:
-
-void ViewManagerClientImpl::OnWindowManagerReady() {}
+// ViewManagerClientImpl, WindowManagerClient implementation:
 
 void ViewManagerClientImpl::OnCaptureChanged(Id old_capture_view_id,
                                              Id new_capture_view_id) {}
 
 void ViewManagerClientImpl::OnFocusChanged(Id old_focused_view_id,
                                            Id new_focused_view_id) {
   View* focused = GetViewById(new_focused_view_id);
   View* blurred = GetViewById(old_focused_view_id);
   if (blurred) {
     FOR_EACH_OBSERVER(ViewObserver,
@@ skipping 34 matching lines @@
                     base::Unretained(this));
 }
 
 base::Callback<void(ErrorCode)>
     ViewManagerClientImpl::ActionCompletedCallbackWithErrorCode() {
   return base::Bind(&ViewManagerClientImpl::OnActionCompletedWithErrorCode,
                     base::Unretained(this));
 }
 
 }  // namespace mojo