| Index: components/mus/view_tree_host_connection.cc
|
| diff --git a/components/view_manager/view_tree_host_connection.cc b/components/mus/view_tree_host_connection.cc
|
| similarity index 83%
|
| rename from components/view_manager/view_tree_host_connection.cc
|
| rename to components/mus/view_tree_host_connection.cc
|
| index 429143cfd621bc7a8922461cfdab7097480b8ab8..5fc33910c312b565174a1c517e113afbfd47047b 100644
|
| --- a/components/view_manager/view_tree_host_connection.cc
|
| +++ b/components/mus/view_tree_host_connection.cc
|
| @@ -2,10 +2,10 @@
|
| // 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_connection.h"
|
| +#include "components/mus/view_tree_host_connection.h"
|
|
|
| -#include "components/view_manager/connection_manager.h"
|
| -#include "components/view_manager/view_tree_host_impl.h"
|
| +#include "components/mus/connection_manager.h"
|
| +#include "components/mus/view_tree_host_impl.h"
|
|
|
| namespace view_manager {
|
|
|
| @@ -15,8 +15,7 @@ ViewTreeHostConnection::ViewTreeHostConnection(
|
| : host_(host_impl.Pass()),
|
| tree_(nullptr),
|
| connection_manager_(manager),
|
| - connection_closed_(false) {
|
| -}
|
| + connection_closed_(false) {}
|
|
|
| ViewTreeHostConnection::~ViewTreeHostConnection() {
|
| // If this DCHECK fails then something has tried to delete this object without
|
| @@ -24,7 +23,6 @@ ViewTreeHostConnection::~ViewTreeHostConnection() {
|
| DCHECK(connection_closed_);
|
| }
|
|
|
| -
|
| void ViewTreeHostConnection::CloseConnection() {
|
| // A connection error will trigger the display to close and so we want to make
|
| // sure we signal the ConnectionManager only once.
|
| @@ -42,8 +40,7 @@ ViewTreeImpl* ViewTreeHostConnection::GetViewTree() {
|
| return tree_;
|
| }
|
|
|
| -void ViewTreeHostConnection::OnDisplayInitialized() {
|
| -}
|
| +void ViewTreeHostConnection::OnDisplayInitialized() {}
|
|
|
| void ViewTreeHostConnection::OnDisplayClosed() {
|
| CloseConnection();
|
| @@ -56,11 +53,9 @@ ViewTreeHostConnectionImpl::ViewTreeHostConnectionImpl(
|
| ConnectionManager* manager)
|
| : ViewTreeHostConnection(host_impl.Pass(), manager),
|
| binding_(view_tree_host(), request.Pass()),
|
| - client_(client.Pass()) {
|
| -}
|
| + client_(client.Pass()) {}
|
|
|
| -ViewTreeHostConnectionImpl::~ViewTreeHostConnectionImpl() {
|
| -}
|
| +ViewTreeHostConnectionImpl::~ViewTreeHostConnectionImpl() {}
|
|
|
| void ViewTreeHostConnectionImpl::OnDisplayInitialized() {
|
| connection_manager()->AddHost(this);
|
|
|