Restructure public side of view_manager service.

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

Index: mojo/services/view_manager/public/cpp/view_observer.h
diff --git a/mojo/services/public/cpp/view_manager/view_observer.h b/mojo/services/view_manager/public/cpp/view_observer.h
similarity index 93%
rename from mojo/services/public/cpp/view_manager/view_observer.h
rename to mojo/services/view_manager/public/cpp/view_observer.h
index fd31c972951078f2b2492e28147638521ad9b82d..2ce842dd592b6b6498de41c8d27387dca5b88420 100644
--- a/mojo/services/public/cpp/view_manager/view_observer.h
+++ b/mojo/services/view_manager/public/cpp/view_observer.h
@@ -2,15 +2,15 @@
 // 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_OBSERVER_H_
-#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_OBSERVER_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
+#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 
-#include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
+#include "mojo/services/view_manager/public/cpp/view.h"
 
 namespace mojo {
 
@@ -97,4 +97,4 @@ class ViewObserver {
 
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_OBSERVER_H_
+#endif  // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_