Move GLES2, GPU & Surfaces into the ViewManager directory. This does not merge the applications, th…

components/view_manager/surfaces/display_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/surfaces/display_impl.h"
+#include "components/view_manager/surfaces/display_impl.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/display.h"
-#include "components/surfaces/surfaces_context_provider.h"
-#include "components/surfaces/surfaces_output_surface.h"
-#include "components/surfaces/surfaces_scheduler.h"
-#include "components/surfaces/surfaces_service_application.h"
+#include "components/view_manager/surfaces/surfaces_context_provider.h"
+#include "components/view_manager/surfaces/surfaces_output_surface.h"
+#include "components/view_manager/surfaces/surfaces_scheduler.h"
+#include "components/view_manager/surfaces/surfaces_service_application.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 
 namespace surfaces {
 namespace {
 void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
   callback.Run();
 }
 }
 
@@ skipping 119 matching lines @@
   DCHECK(returner_);
 
   mojo::Array<mojo::ReturnedResourcePtr> ret(resources.size());
   for (size_t i = 0; i < resources.size(); ++i) {
     ret[i] = mojo::ReturnedResource::From(resources[i]);
   }
   returner_->ReturnResources(ret.Pass());
 }
 
 }  // namespace surfaces