Move //mojo/services/X/public/... to //mojo/services/X/... (part 4).

mojo/services/view_manager/cpp/view_observer.h

 // Copyright 2014 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 MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_OBSERVER_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_OBSERVER_H_
 
 #include <vector>
 
 #include "input_events/interfaces/input_events.mojom.h"
-#include "view_manager/public/cpp/view.h"
+#include "view_manager/cpp/view.h"
 
 namespace mojo {
 
 class View;
 
 // A note on -ing and -ed suffixes:
 //
 // -ing methods are called before changes are applied to the local view model.
 // -ed methods are called after changes are applied to the local view model.
 //
@@ skipping 56 matching lines @@
       View* view,
       const std::string& name,
       const std::vector<uint8_t>* old_data,
       const std::vector<uint8_t>* new_data) {}
 
   // Invoked when SetProperty() or ClearProperty() is called on the window.
   // |key| is either a WindowProperty<T>* (SetProperty, ClearProperty). Either
   // way, it can simply be compared for equality with the property
   // constant. |old| is the old property value, which must be cast to the
   // appropriate type before use.
-  virtual void OnViewLocalPropertyChanged(
-      View* view,
-      const void* key,
-      intptr_t old) {}
+  virtual void OnViewLocalPropertyChanged(View* view,
+                                          const void* key,
+                                          intptr_t old) {}
 
   virtual void OnViewEmbeddedAppDisconnected(View* view) {}
 
   // Sent when the drawn state changes. This is only sent for the root nodes
   // when embedded.
   virtual void OnViewDrawnChanging(View* view) {}
   virtual void OnViewDrawnChanged(View* view) {}
 
  protected:
   virtual ~ViewObserver() {}
 };
 
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
+#endif  // MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_OBSERVER_H_