mus: Introduce AttachSurface to allow creating Surface prior to OnEmbed

components/mus/public/cpp/lib/window.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 "components/mus/public/cpp/window.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 199 matching lines @@
   LocalSetVisible(value);
 }
 
 bool Window::IsDrawn() const {
   if (!visible_)
     return false;
   return parent_ ? parent_->IsDrawn() : drawn_;
 }
 
 scoped_ptr<WindowSurface> Window::RequestSurface(mojom::SurfaceType type) {
-  mojom::SurfacePtr surface;
-  mojom::SurfaceClientPtr client;
-  mojo::InterfaceRequest<mojom::SurfaceClient> client_request =
-      GetProxy(&client);
-  tree_client()->RequestSurface(id_, type, GetProxy(&surface), client.Pass());
-  return make_scoped_ptr(
-      new WindowSurface(surface.PassInterface(), client_request.Pass()));
+  scoped_ptr<WindowSurfaceBinding> surface_binding;
+  scoped_ptr<WindowSurface> surface = WindowSurface::Create(&surface_binding);
+  AttachSurface(type, surface_binding.Pass());
+  return surface;
+}
+
+void Window::AttachSurface(mojom::SurfaceType type,
+                           scoped_ptr<WindowSurfaceBinding> surface_binding) {
+  tree_client()->AttachSurface(id_, type,
+                               surface_binding->surface_request_.Pass(),
+                               surface_binding->surface_client_.Pass());
 }
 
 void Window::ClearSharedProperty(const std::string& name) {
   SetSharedPropertyInternal(name, nullptr);
 }
 
 bool Window::HasSharedProperty(const std::string& name) const {
   return properties_.count(name) > 0;
 }
 
@@ skipping 529 matching lines @@
     notifier->NotifyWindowReordered();
 
   return true;
 }
 
 // static
 Window** Window::GetStackingTarget(Window* window) {
   return &window->stacking_target_;
 }
 }  // namespace mus