Revert of Mus+Ash: propagate Surface ID to parents

services/ui/public/cpp/window_tree_client.h

 // 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.
 
 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 115 matching lines @@
              uint32_t flags,
              const mojom::WindowTree::EmbedCallback& callback);
 
   void RequestClose(Window* window);
 
   void AttachSurface(Id window_id,
                      mojom::SurfaceType type,
                      mojo::InterfaceRequest<mojom::Surface> surface,
                      mojom::SurfaceClientPtr client);
 
-  void OnWindowSurfaceDetached(Id window_id,
-                               const cc::SurfaceSequence& sequence);
-
   // Sets the input capture to |window| without notifying the server.
   void LocalSetCapture(Window* window);
   // Sets focus to |window| without notifying the server.
   void LocalSetFocus(Window* window);
 
   // Start/stop tracking windows. While tracked, they can be retrieved via
   // WindowTreeClient::GetWindowById.
   void AddWindow(Window* window);
 
   bool IsRoot(Window* window) const { return roots_.count(window) > 0; }
@@ skipping 175 matching lines @@
                                      mojo::Array<uint8_t> new_data) override;
   void OnWindowInputEvent(uint32_t event_id,
                           Id window_id,
                           std::unique_ptr<ui::Event> event,
                           bool matches_pointer_watcher) override;
   void OnPointerEventObserved(std::unique_ptr<ui::Event> event,
                               uint32_t window_id) override;
   void OnWindowFocused(Id focused_window_id) override;
   void OnWindowPredefinedCursorChanged(Id window_id,
                                        mojom::Cursor cursor) override;
-  void OnWindowSurfaceChanged(Id window_id,
-                              const cc::SurfaceId& surface_id,
-                              const cc::SurfaceSequence& surface_sequence,
-                              const gfx::Size& frame_size,
-                              float device_scale_factor) override;
   void OnDragDropStart(
       mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) override;
   void OnDragEnter(Id window_id,
                    uint32_t event_flags,
                    const gfx::Point& position,
                    uint32_t effect_bitmask,
                    const OnDragEnterCallback& callback) override;
   void OnDragOver(Id window_id,
                   uint32_t event_flags,
                   const gfx::Point& position,
@@ skipping 137 matching lines @@
   std::set<Id> drag_entered_windows_;
 
   base::WeakPtrFactory<WindowTreeClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_