Mandoline: Merge Surfaces and Views apps

components/view_manager/view_manager_root_impl.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 "components/view_manager/view_manager_root_impl.h"
 
 #include "components/view_manager/connection_manager.h"
 #include "components/view_manager/display_manager.h"
 #include "components/view_manager/public/cpp/types.h"
 #include "components/view_manager/view_manager_root_delegate.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 
 namespace view_manager {
 
 ViewManagerRootImpl::ViewManagerRootImpl(
     ConnectionManager* connection_manager,
     bool is_headless,
     mojo::ApplicationImpl* app_impl,
-    const scoped_refptr<gles2::GpuState>& gpu_state)
+    const scoped_refptr<gles2::GpuState>& gpu_state,
+    const scoped_refptr<surfaces::SurfacesState>& surfaces_state)
     : delegate_(nullptr),
       connection_manager_(connection_manager),
       display_manager_(
-          DisplayManager::Create(is_headless, app_impl, gpu_state)) {
+          DisplayManager::Create(is_headless,
+                                 app_impl,
+                                 gpu_state,
+                                 surfaces_state)) {
   display_manager_->Init(this);
 }
 
 ViewManagerRootImpl::~ViewManagerRootImpl() {
 }
 
 void ViewManagerRootImpl::Init(ViewManagerRootDelegate* delegate) {
   delegate_ = delegate;
   if (delegate_ && root_)
     delegate_->OnDisplayInitialized();
@@ skipping 78 matching lines @@
       delegate_->OnDisplayInitialized();
   } else {
     root_->SetBounds(gfx::Rect(new_metrics.size_in_pixels.To<gfx::Size>()));
   }
   // TODO(fsamuel): We shouldn't broadcast this to all connections but only
   // those within a window root.
   connection_manager_->ProcessViewportMetricsChanged(old_metrics, new_metrics);
 }
 
 }  // namespace view_manager