Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1

mojo/services/view_manager/public/cpp/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/view_manager/public/cpp/lib/view_manager_client_impl.h"
+#include "view_manager/public/cpp/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"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/view_manager/public/cpp/lib/view_private.h"
-#include "mojo/services/view_manager/public/cpp/util.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "view_manager/public/cpp/lib/view_private.h"
+#include "view_manager/public/cpp/util.h"
+#include "view_manager/public/cpp/view_manager_delegate.h"
+#include "view_manager/public/cpp/view_observer.h"
 
 namespace mojo {
 
 Id MakeTransportId(ConnectionSpecificId connection_id,
                    ConnectionSpecificId local_id) {
   return (connection_id << 16) | local_id;
 }
 
 // Helper called to construct a local view object from transport data.
 View* AddViewToViewManager(ViewManagerClientImpl* client,
                            View* parent,
                            const ViewDataPtr& view_data) {
   // We don't use the ctor that takes a ViewManager here, since it will call
   // back to the service and attempt to create a new view.
   View* view = ViewPrivate::LocalCreate();
   ViewPrivate private_view(view);
   private_view.set_view_manager(client);
   private_view.set_id(view_data->view_id);
   private_view.set_visible(view_data->visible);
   private_view.set_drawn(view_data->drawn);
+  private_view.set_viewport_metrics(view_data->viewport_metrics.Pass());
   private_view.set_properties(
       view_data->properties.To<std::map<std::string, std::vector<uint8_t>>>());
   client->AddView(view);
   private_view.LocalSetBounds(Rect(), *view_data->bounds);
   if (parent)
     ViewPrivate(parent).LocalAddChild(view);
   return view;
 }
 
 View* BuildViewTree(ViewManagerClientImpl* client,
@@ skipping 218 matching lines @@
   connection_id_ = connection_id;
   creator_url_ = String::From(creator_url);
 
   DCHECK(!root_);
   root_ = AddViewToViewManager(this, nullptr, root_data);
   root_->AddObserver(new RootObserver(root_));
 
   ServiceProviderImpl* exported_services = nullptr;
   scoped_ptr<ServiceProvider> remote;
 
-  if (parent_services.is_pending()) {
-    // BindToRequest() binds the lifetime of |exported_services| to the pipe.
-    exported_services = new ServiceProviderImpl;
-    BindToRequest(exported_services, &parent_services);
-    remote.reset(exported_services->CreateRemoteServiceProvider());
-  }
+  // BindToRequest() binds the lifetime of |exported_services| to the pipe.
+  exported_services = new ServiceProviderImpl;
+  BindToRequest(exported_services, &parent_services);
+  remote.reset(exported_services->CreateRemoteServiceProvider());
+
   window_manager_.Bind(window_manager_pipe.Pass());
   window_manager_.set_client(this);
   // base::Unretained() is safe here as |window_manager_| is bound to our
   // lifetime.
   window_manager_->GetFocusedAndActiveViews(
       base::Bind(&ViewManagerClientImpl::OnGotFocusedAndActiveViews,
                  base::Unretained(this)));
   delegate_->OnEmbed(root_, exported_services, remote.Pass());
 }
 
@@ skipping 184 matching lines @@
                                                        uint32 active_view_id) {
   if (GetViewById(focused_view_id) != focused_view_)
     OnFocusChanged(focused_view_ ? focused_view_->id() : 0, focused_view_id);
   if (GetViewById(active_view_id) != activated_view_) {
     OnActiveWindowChanged(activated_view_ ? activated_view_->id() : 0,
                           active_view_id);
   }
 }
 
 }  // namespace mojo