| Index: components/mus/view_tree_host_impl.cc
|
| diff --git a/components/view_manager/view_tree_host_impl.cc b/components/mus/view_tree_host_impl.cc
|
| similarity index 92%
|
| rename from components/view_manager/view_tree_host_impl.cc
|
| rename to components/mus/view_tree_host_impl.cc
|
| index 70093b0eadb31e18bf2e6321a0a433c78285c7fe..775c5f98ed35054a12e1c07ef2cd9f605f71efea 100644
|
| --- a/components/view_manager/view_tree_host_impl.cc
|
| +++ b/components/mus/view_tree_host_impl.cc
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/view_manager/view_tree_host_impl.h"
|
| +#include "components/mus/view_tree_host_impl.h"
|
|
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "components/view_manager/connection_manager.h"
|
| -#include "components/view_manager/display_manager.h"
|
| -#include "components/view_manager/focus_controller.h"
|
| -#include "components/view_manager/public/cpp/types.h"
|
| -#include "components/view_manager/view_tree_host_delegate.h"
|
| -#include "components/view_manager/view_tree_impl.h"
|
| +#include "components/mus/connection_manager.h"
|
| +#include "components/mus/display_manager.h"
|
| +#include "components/mus/focus_controller.h"
|
| +#include "components/mus/public/cpp/types.h"
|
| +#include "components/mus/view_tree_host_delegate.h"
|
| +#include "components/mus/view_tree_impl.h"
|
| #include "mojo/common/common_type_converters.h"
|
| #include "mojo/converters/geometry/geometry_type_converters.h"
|
|
|
| @@ -27,22 +27,19 @@ ViewTreeHostImpl::ViewTreeHostImpl(
|
| connection_manager_(connection_manager),
|
| client_(client.Pass()),
|
| event_dispatcher_(this),
|
| - display_manager_(
|
| - DisplayManager::Create(is_headless,
|
| - app_impl,
|
| - gpu_state,
|
| - surfaces_state)),
|
| + display_manager_(DisplayManager::Create(is_headless,
|
| + app_impl,
|
| + gpu_state,
|
| + surfaces_state)),
|
| focus_controller_(new FocusController(this)) {
|
| display_manager_->Init(this);
|
| if (client_) {
|
| client_.set_connection_error_handler(
|
| - base::Bind(&ViewTreeHostImpl::OnClientClosed,
|
| - base::Unretained(this)));
|
| + base::Bind(&ViewTreeHostImpl::OnClientClosed, base::Unretained(this)));
|
| }
|
| }
|
|
|
| -ViewTreeHostImpl::~ViewTreeHostImpl() {
|
| -}
|
| +ViewTreeHostImpl::~ViewTreeHostImpl() {}
|
|
|
| void ViewTreeHostImpl::Init(ViewTreeHostDelegate* delegate) {
|
| delegate_ = delegate;
|
|
|