| Index: components/mus/vm/connection_manager.cc
|
| diff --git a/components/mus/connection_manager.cc b/components/mus/vm/connection_manager.cc
|
| similarity index 96%
|
| rename from components/mus/connection_manager.cc
|
| rename to components/mus/vm/connection_manager.cc
|
| index b82ed5f42f95cb80463877ae20113787b915b712..0f01ba72cf2d171bfa8bacdf0dbd41265bf89718 100644
|
| --- a/components/mus/connection_manager.cc
|
| +++ b/components/mus/vm/connection_manager.cc
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/mus/connection_manager.h"
|
| +#include "components/mus/vm/connection_manager.h"
|
|
|
| #include "base/logging.h"
|
| #include "base/stl_util.h"
|
| #include "cc/output/compositor_frame.h"
|
| #include "cc/quads/shared_quad_state.h"
|
| #include "cc/quads/surface_draw_quad.h"
|
| -#include "components/mus/client_connection.h"
|
| -#include "components/mus/connection_manager_delegate.h"
|
| -#include "components/mus/server_view.h"
|
| -#include "components/mus/view_coordinate_conversions.h"
|
| -#include "components/mus/view_tree_host_connection.h"
|
| -#include "components/mus/view_tree_impl.h"
|
| +#include "components/mus/vm/client_connection.h"
|
| +#include "components/mus/vm/connection_manager_delegate.h"
|
| +#include "components/mus/vm/server_view.h"
|
| +#include "components/mus/vm/view_coordinate_conversions.h"
|
| +#include "components/mus/vm/view_tree_host_connection.h"
|
| +#include "components/mus/vm/view_tree_impl.h"
|
| #include "mojo/application/public/cpp/application_connection.h"
|
| #include "mojo/converters/geometry/geometry_type_converters.h"
|
| #include "mojo/converters/input_events/input_events_type_converters.h"
|
| @@ -454,13 +454,10 @@ bool ConnectionManager::ConvertSurfaceDrawQuad(
|
| // better home for it. http://crbug.com/533029.
|
| cc::SurfaceDrawQuad* surface_quad =
|
| render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
|
| - surface_quad->SetAll(
|
| - sqs,
|
| - input->rect.To<gfx::Rect>(),
|
| - input->opaque_rect.To<gfx::Rect>(),
|
| - input->visible_rect.To<gfx::Rect>(),
|
| - input->needs_blending,
|
| - view->surface_id());
|
| + surface_quad->SetAll(sqs, input->rect.To<gfx::Rect>(),
|
| + input->opaque_rect.To<gfx::Rect>(),
|
| + input->visible_rect.To<gfx::Rect>(),
|
| + input->needs_blending, view->surface_id());
|
| return true;
|
| }
|
|
|
|
|