mus: move View Manager to components/mus/vm

components/mus/vm/display_manager.cc

Index: components/mus/vm/display_manager.cc
diff --git a/components/mus/display_manager.cc b/components/mus/vm/display_manager.cc
similarity index 95%
rename from components/mus/display_manager.cc
rename to components/mus/vm/display_manager.cc
index 858016c17639b57885821d77b6e7d25cabf70856..d13031872dc52d4480530132ef63b8a5d74aa218 100644
--- a/components/mus/display_manager.cc
+++ b/components/mus/vm/display_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/display_manager.h"
+#include "components/mus/vm/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "cc/output/compositor_frame.h"
@@ -10,13 +10,13 @@
 #include "cc/quads/render_pass.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/surface_draw_quad.h"
-#include "components/mus/display_manager_factory.h"
 #include "components/mus/gles2/gpu_state.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
 #include "components/mus/public/interfaces/quads.mojom.h"
-#include "components/mus/server_view.h"
 #include "components/mus/surfaces/surfaces_state.h"
-#include "components/mus/view_coordinate_conversions.h"
+#include "components/mus/vm/display_manager_factory.h"
+#include "components/mus/vm/server_view.h"
+#include "components/mus/vm/view_coordinate_conversions.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
@@ -66,10 +66,9 @@ void DrawViewTree(cc::RenderPass* pass,
   // TODO(rjkroege, fsamuel): Make sure we're handling alpha correctly.
   const float combined_opacity = opacity * view->opacity();
   for (auto it = children.rbegin(); it != children.rend(); ++it) {
-    DrawViewTree(pass, *it, absolute_bounds.OffsetFromOrigin(),
-                combined_opacity,
-                view->parent() &&
-                    !view->surface_id().is_null() /* skip_view */);
+    DrawViewTree(
+        pass, *it, absolute_bounds.OffsetFromOrigin(), combined_opacity,
+        view->parent() && !view->surface_id().is_null() /* skip_view */);
   }
 
   if (skip_view || view->surface_id().is_null())
@@ -247,10 +246,8 @@ DefaultDisplayManager::GenerateCompositorFrame() {
   render_pass->damage_rect = dirty_rect_;
   render_pass->output_rect = gfx::Rect(metrics_.size_in_pixels.To<gfx::Size>());
 
-  DrawViewTree(render_pass.get(),
-               delegate_->GetRootView(),
-               gfx::Vector2d(), 1.0f,
-               false /* skip_view */);
+  DrawViewTree(render_pass.get(), delegate_->GetRootView(), gfx::Vector2d(),
+               1.0f, false /* skip_view */);
 
   scoped_ptr<cc::DelegatedFrameData> frame_data(new cc::DelegatedFrameData);
   frame_data->device_scale_factor = metrics_.device_pixel_ratio;