Revert of Start of display management for mus

components/mus/ws/window_tree_host_impl.cc

 // Copyright 2015 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/window_tree_host_impl.h"
 
 #include "base/debug/debugger.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/input_event_constants.mojom.h"
@@ skipping 33 matching lines @@
   return true;
 }
 
 mojom::EventPtr CoalesceEvents(mojom::EventPtr first, mojom::EventPtr second) {
   DCHECK_EQ(first->action, mojom::EventType::POINTER_MOVE)
       << " Non-move events cannot be merged yet.";
   // For mouse moves, the new event just replaces the old event.
   return second;
 }
 
-uint32_t next_id = 1;
-
 }  // namespace
 
 class WindowTreeHostImpl::ProcessedEventTarget {
  public:
   ProcessedEventTarget(ServerWindow* window, bool in_nonclient_area)
       : in_nonclient_area_(in_nonclient_area) {
     tracker_.Add(window);
   }
 
   ~ProcessedEventTarget() {}
@@ skipping 27 matching lines @@
     const scoped_refptr<SurfacesState>& surfaces_state,
     mojom::WindowManagerPtr window_manager)
     : delegate_(nullptr),
       connection_manager_(connection_manager),
       client_(std::move(client)),
       event_dispatcher_(this),
       display_manager_(
           DisplayManager::Create(app_impl, gpu_state, surfaces_state)),
       window_manager_(std::move(window_manager)),
       tree_awaiting_input_ack_(nullptr),
-      last_cursor_(0),
-      id_(next_id) {
+      last_cursor_(0) {
   display_manager_->Init(this);
   if (client_) {
     client_.set_connection_error_handler(base::Bind(
         &WindowTreeHostImpl::OnClientClosed, base::Unretained(this)));
   }
 }
 
 WindowTreeHostImpl::~WindowTreeHostImpl() {
   DestroyFocusController();
   for (ServerWindow* window : windows_needing_frame_destruction_)
@@ skipping 36 matching lines @@
   if (windows_needing_frame_destruction_.count(window))
     return;
   windows_needing_frame_destruction_.insert(window);
   window->AddObserver(this);
 }
 
 const mojom::ViewportMetrics& WindowTreeHostImpl::GetViewportMetrics() const {
   return display_manager_->GetViewportMetrics();
 }
 
-mojom::Rotation WindowTreeHostImpl::GetRotation() const {
-  return display_manager_->GetRotation();
-}
-
 void WindowTreeHostImpl::SetFocusedWindow(ServerWindow* new_focused_window) {
   ServerWindow* old_focused_window = focus_controller_->GetFocusedWindow();
   if (old_focused_window == new_focused_window)
     return;
   DCHECK(root_window()->Contains(new_focused_window));
   focus_controller_->SetFocusedWindow(new_focused_window);
 }
 
 ServerWindow* WindowTreeHostImpl::GetFocusedWindow() {
   return focus_controller_->GetFocusedWindow();
@@ skipping 361 matching lines @@
   DispatchInputEventToWindowImpl(target, in_nonclient_area, std::move(event));
 }
 
 void WindowTreeHostImpl::OnWindowDestroyed(ServerWindow* window) {
   windows_needing_frame_destruction_.erase(window);
   window->RemoveObserver(this);
 }
 
 }  // namespace ws
 }  // namespace mus