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

mojo/services/view_manager/cpp/lib/view_manager_client_impl.cc

Index: mojo/services/view_manager/cpp/lib/view_manager_client_impl.cc
diff --git a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc b/mojo/services/view_manager/cpp/lib/view_manager_client_impl.cc
similarity index 90%
rename from mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc
rename to mojo/services/view_manager/cpp/lib/view_manager_client_impl.cc
index b8262d1a95a8c5277fea0ceb001ec3b233662369..6852f660dcd1bb6cbff39c935f7905061b4053d1 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc
+++ b/mojo/services/view_manager/cpp/lib/view_manager_client_impl.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "view_manager/public/cpp/lib/view_manager_client_impl.h"
+#include "view_manager/cpp/lib/view_manager_client_impl.h"
 
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
-#include "view_manager/public/cpp/lib/view_private.h"
-#include "view_manager/public/cpp/util.h"
-#include "view_manager/public/cpp/view_manager_delegate.h"
-#include "view_manager/public/cpp/view_observer.h"
+#include "view_manager/cpp/lib/view_private.h"
+#include "view_manager/cpp/util.h"
+#include "view_manager/cpp/view_manager_delegate.h"
+#include "view_manager/cpp/view_observer.h"
 
 namespace mojo {
 
@@ -144,10 +144,9 @@ void ViewManagerClientImpl::RemoveChild(Id child_id, Id parent_id) {
   service_->RemoveViewFromParent(child_id, ActionCompletedCallback());
 }
 
-void ViewManagerClientImpl::Reorder(
-    Id view_id,
-    Id relative_view_id,
-    OrderDirection direction) {
+void ViewManagerClientImpl::Reorder(Id view_id,
+                                    Id relative_view_id,
+                                    OrderDirection direction) {
   DCHECK(service_);
   service_->ReorderView(view_id, relative_view_id, direction,
                         ActionCompletedCallback());
@@ -166,8 +165,8 @@ void ViewManagerClientImpl::SetSurfaceId(Id view_id, SurfaceIdPtr surface_id) {
   DCHECK(service_);
   if (surface_id.is_null())
     return;
-  service_->SetViewSurfaceId(
-      view_id, surface_id.Pass(), ActionCompletedCallback());
+  service_->SetViewSurfaceId(view_id, surface_id.Pass(),
+                             ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::SetFocus(Id view_id) {
@@ -182,14 +181,11 @@ void ViewManagerClientImpl::SetVisible(Id view_id, bool visible) {
   service_->SetViewVisibility(view_id, visible, ActionCompletedCallback());
 }
 
-void ViewManagerClientImpl::SetProperty(
-    Id view_id,
-    const std::string& name,
-    const std::vector<uint8_t>& data) {
+void ViewManagerClientImpl::SetProperty(Id view_id,
+                                        const std::string& name,
+                                        const std::vector<uint8_t>& data) {
   DCHECK(service_);
-  service_->SetViewProperty(view_id,
-                            String(name),
-                            Array<uint8_t>::From(data),
+  service_->SetViewProperty(view_id, String(name), Array<uint8_t>::From(data),
                             ActionCompletedCallback());
 }
 
@@ -353,8 +349,7 @@ void ViewManagerClientImpl::OnViewHierarchyChanged(
     Id new_parent_id,
     Id old_parent_id,
     mojo::Array<ViewDataPtr> views) {
-  View* initial_parent = views.size() ?
-      GetViewById(views[0]->parent_id) : NULL;
+  View* initial_parent = views.size() ? GetViewById(views[0]->parent_id) : NULL;
 
   BuildViewTree(this, views, initial_parent);
 
@@ -420,8 +415,7 @@ void ViewManagerClientImpl::OnViewInputEvent(
     const Callback<void()>& ack_callback) {
   View* view = GetViewById(view_id);
   if (view) {
-    FOR_EACH_OBSERVER(ViewObserver,
-                      *ViewPrivate(view).observers(),
+    FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(view).observers(),
                       OnViewInputEvent(view, event));
   }
   ack_callback.Run();
@@ -442,14 +436,12 @@ void ViewManagerClientImpl::OnCaptureChanged(Id capture_view_id) {
   View* gained_capture = GetViewById(capture_view_id);
   View* lost_capture = capture_view_;
   if (lost_capture) {
-    FOR_EACH_OBSERVER(ViewObserver,
-                      *ViewPrivate(lost_capture).observers(),
+    FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(lost_capture).observers(),
                       OnViewFocusChanged(gained_capture, lost_capture));
   }
   capture_view_ = gained_capture;
   if (gained_capture) {
-    FOR_EACH_OBSERVER(ViewObserver,
-                      *ViewPrivate(gained_capture).observers(),
+    FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(gained_capture).observers(),
                       OnViewFocusChanged(gained_capture, lost_capture));
   }
 }
@@ -458,14 +450,12 @@ void ViewManagerClientImpl::OnFocusChanged(Id focused_view_id) {
   View* focused = GetViewById(focused_view_id);
   View* blurred = focused_view_;
   if (blurred) {
-    FOR_EACH_OBSERVER(ViewObserver,
-                      *ViewPrivate(blurred).observers(),
+    FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(blurred).observers(),
                       OnViewFocusChanged(focused, blurred));
   }
   focused_view_ = focused;
   if (focused) {
-    FOR_EACH_OBSERVER(ViewObserver,
-                      *ViewPrivate(focused).observers(),
+    FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(focused).observers(),
                       OnViewFocusChanged(focused, blurred));
   }
 }
@@ -474,14 +464,12 @@ void ViewManagerClientImpl::OnActiveWindowChanged(Id active_view_id) {
   View* activated = GetViewById(active_view_id);
   View* deactivated = activated_view_;
   if (deactivated) {
-    FOR_EACH_OBSERVER(ViewObserver,
-                      *ViewPrivate(deactivated).observers(),
+    FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(deactivated).observers(),
                       OnViewActivationChanged(activated, deactivated));
   }
   activated_view_ = activated;
   if (activated) {
-    FOR_EACH_OBSERVER(ViewObserver,
-                      *ViewPrivate(activated).observers(),
+    FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(activated).observers(),
                       OnViewActivationChanged(activated, deactivated));
   }
 }