| Index: components/mus/connection_manager.cc
|
| diff --git a/components/view_manager/connection_manager.cc b/components/mus/connection_manager.cc
|
| similarity index 95%
|
| rename from components/view_manager/connection_manager.cc
|
| rename to components/mus/connection_manager.cc
|
| index c3ab945ad0da56bd333708def132eb24553e4f20..2a86f1070e5967409e5241dbec47bcec9b112da6 100644
|
| --- a/components/view_manager/connection_manager.cc
|
| +++ b/components/mus/connection_manager.cc
|
| @@ -2,18 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/view_manager/connection_manager.h"
|
| +#include "components/mus/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 "components/view_manager/client_connection.h"
|
| -#include "components/view_manager/connection_manager_delegate.h"
|
| -#include "components/view_manager/server_view.h"
|
| -#include "components/view_manager/view_coordinate_conversions.h"
|
| -#include "components/view_manager/view_tree_host_connection.h"
|
| -#include "components/view_manager/view_tree_impl.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 "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"
|
| @@ -46,8 +46,7 @@ ConnectionManager::ConnectionManager(
|
| next_connection_id_(1),
|
| next_host_id_(0),
|
| current_change_(nullptr),
|
| - in_destructor_(false) {
|
| -}
|
| + in_destructor_(false) {}
|
|
|
| ConnectionManager::~ConnectionManager() {
|
| in_destructor_ = true;
|
| @@ -64,8 +63,7 @@ ConnectionManager::~ConnectionManager() {
|
| DCHECK(connection_map_.empty());
|
| }
|
|
|
| -void ConnectionManager::AddHost(
|
| - ViewTreeHostConnection* host_connection) {
|
| +void ConnectionManager::AddHost(ViewTreeHostConnection* host_connection) {
|
| DCHECK_EQ(0u, host_connection_map_.count(host_connection->view_tree_host()));
|
| host_connection_map_[host_connection->view_tree_host()] = host_connection;
|
| }
|
| @@ -104,13 +102,12 @@ void ConnectionManager::OnConnectionError(ClientConnection* connection) {
|
|
|
| // Notify remaining connections so that they can cleanup.
|
| for (auto& pair : connection_map_) {
|
| - pair.second->service()->OnWillDestroyViewTreeImpl(
|
| - connection->service());
|
| + pair.second->service()->OnWillDestroyViewTreeImpl(connection->service());
|
| }
|
| }
|
|
|
| void ConnectionManager::OnHostConnectionClosed(
|
| - ViewTreeHostConnection* connection) {
|
| + ViewTreeHostConnection* connection) {
|
| auto it = host_connection_map_.find(connection->view_tree_host());
|
| DCHECK(it != host_connection_map_.end());
|
|
|
| @@ -405,8 +402,8 @@ void ConnectionManager::OnWillChangeViewVisibility(ServerView* view) {
|
|
|
| // Need to repaint if the view was drawn (which means it's in the process of
|
| // hiding) or the view is transitioning to drawn.
|
| - if (view->parent() && (view->IsDrawn() ||
|
| - (!view->visible() && view->parent()->IsDrawn()))) {
|
| + if (view->parent() &&
|
| + (view->IsDrawn() || (!view->visible() && view->parent()->IsDrawn()))) {
|
| SchedulePaint(view->parent(), view->bounds());
|
| }
|
|
|
|
|