Mandoline: Merge Surfaces and Views apps

mandoline/ui/aura/surface_binding.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 "mandoline/ui/aura/surface_binding.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 34 matching lines @@
   void SwapBuffers(cc::CompositorFrame* frame) override;
 
  private:
   mojo::View* view_;
   mojo::Surface* surface_;
   uint32_t id_namespace_;
   uint32_t* next_local_id_;  // Owned by PerViewManagerState.
   uint32_t local_id_;
   gfx::Size surface_size_;
 
-  DISALLOW_COPY_AND_ASSIGN(OutputSurfaceImpl);

[rjkroege, 2015/08/06 00:16:22]

why did you remove? maybe not a good idea?

[Fady Samuel, 2015/08/06 16:48:24]

accident. Restored.

 };
 
 OutputSurfaceImpl::OutputSurfaceImpl(
     mojo::View* view,
     const scoped_refptr<cc::ContextProvider>& context_provider,
     mojo::Surface* surface,
     uint32_t id_namespace,
     uint32_t* next_local_id)
     : cc::OutputSurface(context_provider),
       view_(view),
@@ skipping 132 matching lines @@
     delete view_map;
     view_states.Pointer()->Set(nullptr);
   }
 }
 
 void SurfaceBinding::PerViewManagerState::Init() {
   DCHECK(!surface_.get());
 
   mojo::ServiceProviderPtr surfaces_service_provider;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
-  request->url = mojo::String::From("mojo:surfaces_service");
+  request->url = mojo::String::From("mojo:view_manager");
   shell_->ConnectToApplication(request.Pass(),
                                GetProxy(&surfaces_service_provider),
                                nullptr,
                                nullptr);
   ConnectToService(surfaces_service_provider.get(), &surface_);
   surface_->GetIdNamespace(
       base::Bind(&SurfaceBinding::PerViewManagerState::SetIdNamespace,
                  base::Unretained(this)));
   // Block until we receive our id namespace.
   surface_.WaitForIncomingResponse();
@@ skipping 31 matching lines @@
 }
 
 SurfaceBinding::~SurfaceBinding() {
 }
 
 scoped_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
   return state_->CreateOutputSurface(view_);
 }
 
 }  // namespace mandoline