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

components/view_manager/surfaces/display_impl.h

 // 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.
 
-#ifndef COMPONENTS_SURFACES_DISPLAY_IMPL_H_
-#define COMPONENTS_SURFACES_DISPLAY_IMPL_H_
+#ifndef COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_IMPL_H_
+#define COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
-#include "components/surfaces/public/interfaces/display.mojom.h"
+#include "components/view_manager/public/interfaces/display.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 namespace cc {
 class Display;
 class SurfaceFactory;
 }
 
 namespace surfaces {
 class SurfacesScheduler;
 class SurfacesServiceApplication;
@@ skipping 51 matching lines @@
   scoped_ptr<cc::Display> display_;
 
   mojo::Binding<mojo::ViewportParameterListener> viewport_param_binding_;
   mojo::StrongBinding<mojo::Display> display_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayImpl);
 };
 
 }  // namespace surfaces
 
-#endif  // COMPONENTS_SURFACES_DISPLAY_IMPL_H_
+#endif  // COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_IMPL_H_