Revert of Start of display management for mus

components/mus/ws/connection_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/mus/ws/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/mus/ws/client_connection.h"
 #include "components/mus/ws/connection_manager_delegate.h"
 #include "components/mus/ws/operation.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/window_coordinate_conversions.h"
 #include "components/mus/ws/window_tree_host_connection.h"
 #include "components/mus/ws/window_tree_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/shell/public/cpp/application_connection.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace mus {
+
 namespace ws {
 
 ConnectionManager::ConnectionManager(
     ConnectionManagerDelegate* delegate,
     const scoped_refptr<mus::SurfacesState>& surfaces_state)
     : delegate_(delegate),
       surfaces_state_(surfaces_state),
       next_connection_id_(1),
       next_host_id_(0),
       current_operation_(nullptr),
@@ skipping 213 matching lines @@
     if (window == pair.first->root_window())
       return pair.first;
   }
   return nullptr;
 }
 
 WindowTreeHostImpl* ConnectionManager::GetActiveWindowTreeHost() {
   return host_connection_map_.begin()->first;
 }
 
-void ConnectionManager::AddDisplayManagerBinding(
-    mojo::InterfaceRequest<mojom::DisplayManager> request) {
-  display_manager_bindings_.AddBinding(this, std::move(request));
-}
-
 uint32_t ConnectionManager::GenerateWindowManagerChangeId(
     WindowTreeImpl* source,
     uint32_t client_change_id) {
   const uint32_t wm_change_id = next_wm_change_id_++;
   in_flight_wm_change_map_[wm_change_id] = {source->id(), client_change_id};
   return wm_change_id;
 }
 
 void ConnectionManager::WindowManagerChangeCompleted(
     uint32_t window_manager_change_id,
@@ skipping 309 matching lines @@
     ServerWindow* transient_child) {
   // If we're deleting a window, then this is a superfluous message.
   if (current_operation_type() == OperationType::DELETE_WINDOW)
     return;
   for (auto& pair : connection_map_) {
     pair.second->service()->ProcessTransientWindowRemoved(
         window, transient_child, IsOperationSource(pair.first));
   }
 }
 
-void ConnectionManager::AddObserver(mojom::DisplayManagerObserverPtr observer) {
-  mojo::Array<mojom::DisplayPtr> displays(host_connection_map_.size());
-  {
-    size_t i = 0;
-    int next_x = 0;
-    for (auto& pair : host_connection_map_) {
-      const WindowTreeHostImpl* tree_host = pair.first;
-      const ServerWindow* root = tree_host->root_window();
-      displays[i]->id = tree_host->id();
-      displays[i]->bounds = mojo::Rect::New();
-      displays[i]->bounds->x = next_x;
-      displays[i]->bounds->y = 0;
-      displays[i]->bounds->width = root->bounds().size().width();
-      displays[i]->bounds->height = root->bounds().size().height();
-      next_x += displays[i]->bounds->width;
-      // TODO(sky): window manager needs an API to set the work area.
-      displays[i]->work_area = displays[1]->bounds.Clone();
-      displays[i]->device_pixel_ratio =
-          tree_host->GetViewportMetrics().device_pixel_ratio;
-      displays[i]->rotation = tree_host->GetRotation();
-      // TODO(sky): make this real.
-      displays[i]->is_primary = i == 0;
-      // TODO(sky): make this real.
-      displays[i]->touch_support = mojom::TouchSupport::UNKNOWN;
-      ++i;
-    }
-  }
-  observer->OnDisplays(std::move(displays));
-  display_manager_observers_.AddInterfacePtr(std::move(observer));
-}
+}  // namespace ws
 
-}  // namespace ws
 }  // namespace mus