ozone/platform/wayland: Drop WaylandWindow::GetWidget()

ui/ozone/platform/wayland/wayland_window.cc

 // Copyright 2016 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 "ui/ozone/platform/wayland/wayland_window.h"
 
 #include <xdg-shell-unstable-v5-client-protocol.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/ozone/platform/wayland/wayland_display.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
 WaylandWindow::WaylandWindow(PlatformWindowDelegate* delegate,
                              WaylandDisplay* display,
                              const gfx::Rect& bounds)
     : delegate_(delegate), display_(display), bounds_(bounds) {}
 
 WaylandWindow::~WaylandWindow() {
   if (xdg_surface_) {
-    display_->RemoveWindow(this);
+    display_->RemoveWindow(surface_.id());
   }
 }
 
 bool WaylandWindow::Initialize() {
   static const xdg_surface_listener xdg_surface_listener = {
       &WaylandWindow::Configure, &WaylandWindow::Close,
   };
 
   surface_.reset(wl_compositor_create_surface(display_->compositor()));
   if (!surface_) {
     LOG(ERROR) << "Failed to create wl_surface";
     return false;
   }
   wl_surface_set_user_data(surface_.get(), this);
   xdg_surface_.reset(
       xdg_shell_get_xdg_surface(display_->shell(), surface_.get()));
   if (!xdg_surface_) {
     LOG(ERROR) << "Failed to create xdg_surface";
     return false;
   }
   xdg_surface_add_listener(xdg_surface_.get(), &xdg_surface_listener, this);
 
-  display_->AddWindow(this);
+  display_->AddWindow(surface_.id(), this);
   delegate_->OnAcceleratedWidgetAvailable(surface_.id(), 1.f);
 
   return true;
 }
 
-wl_surface* WaylandWindow::GetSurface() {
-  DCHECK(surface_);
-  return surface_.get();
-}
-
-gfx::AcceleratedWidget WaylandWindow::GetWidget() {
-  DCHECK(surface_);
-  return surface_.id();
-}
-
 void WaylandWindow::ApplyPendingBounds() {
   if (pending_bounds_.IsEmpty())
     return;
 
   SetBounds(pending_bounds_);
   DCHECK(xdg_surface_);
   xdg_surface_ack_configure(xdg_surface_.get(), pending_configure_serial_);
   pending_bounds_ = gfx::Rect();
 }
 
@@ skipping 81 matching lines @@
   // during an interactive resize, and only the last one matters.
   window->pending_bounds_ = gfx::Rect(0, 0, width, height);
   window->pending_configure_serial_ = serial;
 }
 
 void WaylandWindow::Close(void* data, xdg_surface* obj) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace ui