Getting rid of SurfaceIdHandler as it is no longer needed.

services/ui/public/cpp/window.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 "services/ui/public/cpp/window.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "services/ui/common/transient_window_utils.h"
 #include "services/ui/public/cpp/property_type_converters.h"
-#include "services/ui/public/cpp/surface_id_handler.h"
 #include "services/ui/public/cpp/window_compositor_frame_sink.h"
 #include "services/ui/public/cpp/window_observer.h"
 #include "services/ui/public/cpp/window_private.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tracker.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/display/display.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 562 matching lines @@
 Window::Window(WindowTreeClient* client, Id id)
     : client_(client),
       server_id_(id),
       parent_(nullptr),
       stacking_target_(nullptr),
       transient_parent_(nullptr),
       is_modal_(false),
       // Matches aura, see aura::Window for details.
       observers_(base::ObserverList<WindowObserver>::NOTIFY_EXISTING_ONLY),
       input_event_handler_(nullptr),
-      surface_id_handler_(nullptr),
       visible_(false),
       opacity_(1.0f),
       display_id_(display::kInvalidDisplayId),
       cursor_id_(mojom::Cursor::CURSOR_NULL),
       parent_drawn_(false) {}
 
 void Window::SetSharedPropertyInternal(const std::string& name,
                                        const std::vector<uint8_t>* value) {
   if (!WasCreatedByThisClientOrIsRoot(this))
     return;
@@ skipping 200 matching lines @@
 
 void Window::LocalSetSurfaceInfo(const cc::SurfaceInfo& surface_info) {
   if (surface_info_.id().is_valid()) {
     const cc::SurfaceId& existing_surface_id = surface_info_.id();
     const cc::SurfaceId& new_surface_id = surface_info.id();
     if (existing_surface_id.is_valid() &&
         existing_surface_id != new_surface_id) {
       // TODO(kylechar): Start return reference here?
     }
   }
-  if (parent_ && parent_->surface_id_handler_) {
-    parent_->surface_id_handler_->OnChildWindowSurfaceChanged(this,
-                                                              surface_info);
-  }
   surface_info_ = surface_info;
 }
 
 void Window::NotifyWindowStackingChanged() {
   if (stacking_target_) {
     Children::const_iterator window_i = std::find(
         parent()->children().begin(), parent()->children().end(), this);
     DCHECK(window_i != parent()->children().end());
     if (window_i != parent()->children().begin() &&
         (*(window_i - 1) == stacking_target_))
@@ skipping 129 matching lines @@
     notifier->NotifyWindowReordered();
 
   return true;
 }
 
 // static
 Window** Window::GetStackingTarget(Window* window) {
   return &window->stacking_target_;
 }
 }  // namespace ui