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

components/view_manager/surfaces/display_impl.h

Index: components/view_manager/surfaces/display_impl.h
diff --git a/components/surfaces/display_impl.h b/components/view_manager/surfaces/display_impl.h
similarity index 91%
rename from components/surfaces/display_impl.h
rename to components/view_manager/surfaces/display_impl.h
index 865e7912ac156cd415cf925ec126ec1557b9573e..ccab383aef4e37f41e0b44e6bb38fd41910258f4 100644
--- a/components/surfaces/display_impl.h
+++ b/components/view_manager/surfaces/display_impl.h
@@ -2,14 +2,14 @@
 // 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 {
@@ -81,4 +81,4 @@ class DisplayImpl : public mojo::Display,
 
 }  // namespace surfaces
 
-#endif  // COMPONENTS_SURFACES_DISPLAY_IMPL_H_
+#endif  // COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_IMPL_H_