Restructure public side of view_manager service.

mojo/services/view_manager/public/cpp/view.h

Index: mojo/services/view_manager/public/cpp/view.h
diff --git a/mojo/services/public/cpp/view_manager/view.h b/mojo/services/view_manager/public/cpp/view.h
similarity index 95%
rename from mojo/services/public/cpp/view_manager/view.h
rename to mojo/services/view_manager/public/cpp/view.h
index c585dd58ca11bdb752e5a28160745b4e266f5357..8950e58b9ca24ae00a0c8884b09bb5073d38ff51 100644
--- a/mojo/services/public/cpp/view_manager/view.h
+++ b/mojo/services/view_manager/public/cpp/view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_H_
-#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
+#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
 
 #include <vector>
 
@@ -11,10 +11,10 @@
 #include "base/observer_list.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
 #include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
-#include "mojo/services/public/interfaces/view_manager/view_manager_constants.mojom.h"
+#include "mojo/services/view_manager/public/cpp/types.h"
+#include "mojo/services/view_manager/public/interfaces/view_manager_constants.mojom.h"
 
 namespace mojo {
 
@@ -199,4 +199,4 @@ class View {
 
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_H_
+#endif  // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_