ozone: Remove "Delegate" from window management IPCs

It was removed from the class name but not the IPC names.

Review URL: https://codereview.chromium.org/1161853007

Cr-Commit-Position: refs/heads/master@{#333161}

ui/ozone/common/gpu/ozone_gpu_messages.h

@@ -89,13 +89,13 @@ IPC_MESSAGE_CONTROL4(OzoneGpuMsg_CursorSet,
 IPC_MESSAGE_CONTROL2(OzoneGpuMsg_CursorMove,
                      gfx::AcceleratedWidget, gfx::Point)
 
-// Explicit creation of a WindowDelegate. We explicitly create the window
-// delegate such that any state change in the window is not lost while the
-// surface is created on the GPU side.
-IPC_MESSAGE_CONTROL1(OzoneGpuMsg_CreateWindowDelegate,
+// Explicit creation of a window. We explicitly create the window such
+// that any state change in the window is not lost while the surface is
+// created on the GPU side.
+IPC_MESSAGE_CONTROL1(OzoneGpuMsg_CreateWindow,
                      gfx::AcceleratedWidget /* widget */)
 
-IPC_MESSAGE_CONTROL1(OzoneGpuMsg_DestroyWindowDelegate,
+IPC_MESSAGE_CONTROL1(OzoneGpuMsg_DestroyWindow,
                      gfx::AcceleratedWidget /* widget */)
 
 // Updates the location and size of the widget on the screen.

ui/ozone/platform/drm/gpu/drm_gpu_platform_support.cc

@@ -122,8 +122,8 @@ class DrmGpuPlatformSupportMessageFilter : public IPC::MessageFilter {
 
   bool MessageAffectsCursorState(uint32 message_type) {
     switch (message_type) {
-      case OzoneGpuMsg_CreateWindowDelegate::ID:
-      case OzoneGpuMsg_DestroyWindowDelegate::ID:
+      case OzoneGpuMsg_CreateWindow::ID:
+      case OzoneGpuMsg_DestroyWindow::ID:
       case OzoneGpuMsg_WindowBoundsChanged::ID:
       case OzoneGpuMsg_ConfigureNativeDisplay::ID:
       case OzoneGpuMsg_DisableNativeDisplay::ID:
@@ -199,9 +199,8 @@ bool DrmGpuPlatformSupport::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
 
   IPC_BEGIN_MESSAGE_MAP(DrmGpuPlatformSupport, message)
-  IPC_MESSAGE_HANDLER(OzoneGpuMsg_CreateWindowDelegate, OnCreateWindowDelegate)
-  IPC_MESSAGE_HANDLER(OzoneGpuMsg_DestroyWindowDelegate,
-                      OnDestroyWindowDelegate)
+  IPC_MESSAGE_HANDLER(OzoneGpuMsg_CreateWindow, OnCreateWindow)
+  IPC_MESSAGE_HANDLER(OzoneGpuMsg_DestroyWindow, OnDestroyWindow)
   IPC_MESSAGE_HANDLER(OzoneGpuMsg_WindowBoundsChanged, OnWindowBoundsChanged)
 
   IPC_MESSAGE_HANDLER(OzoneGpuMsg_CursorSet, OnCursorSet)
@@ -233,16 +232,14 @@ bool DrmGpuPlatformSupport::OnMessageReceived(const IPC::Message& message) {
   return false;
 }
 
-void DrmGpuPlatformSupport::OnCreateWindowDelegate(
-    gfx::AcceleratedWidget widget) {
+void DrmGpuPlatformSupport::OnCreateWindow(gfx::AcceleratedWidget widget) {
   scoped_ptr<DrmWindow> delegate(
       new DrmWindow(widget, drm_device_manager_, screen_manager_));
   delegate->Initialize();
   screen_manager_->AddWindow(widget, delegate.Pass());
 }
 
-void DrmGpuPlatformSupport::OnDestroyWindowDelegate(
-    gfx::AcceleratedWidget widget) {
+void DrmGpuPlatformSupport::OnDestroyWindow(gfx::AcceleratedWidget widget) {
   scoped_ptr<DrmWindow> delegate = screen_manager_->RemoveWindow(widget);
   delegate->Shutdown();
 }

ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h

@@ -59,8 +59,8 @@ class DrmGpuPlatformSupport : public GpuPlatformSupport {
   bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
-  void OnCreateWindowDelegate(gfx::AcceleratedWidget widget);
-  void OnDestroyWindowDelegate(gfx::AcceleratedWidget widget);
+  void OnCreateWindow(gfx::AcceleratedWidget widget);
+  void OnDestroyWindow(gfx::AcceleratedWidget widget);
   void OnWindowBoundsChanged(gfx::AcceleratedWidget widget,
                              const gfx::Rect& bounds);
   void OnCursorSet(gfx::AcceleratedWidget widget,

ui/ozone/platform/drm/host/drm_window_host.cc

@@ -45,7 +45,7 @@ DrmWindowHost::~DrmWindowHost() {
   cursor_->OnWindowRemoved(widget_);
 
   sender_->RemoveChannelObserver(this);
-  sender_->Send(new OzoneGpuMsg_DestroyWindowDelegate(widget_));
+  sender_->Send(new OzoneGpuMsg_DestroyWindow(widget_));
 }
 
 void DrmWindowHost::Initialize() {
@@ -179,7 +179,7 @@ uint32_t DrmWindowHost::DispatchEvent(const PlatformEvent& native_event) {
 }
 
 void DrmWindowHost::OnChannelEstablished() {
-  sender_->Send(new OzoneGpuMsg_CreateWindowDelegate(widget_));
+  sender_->Send(new OzoneGpuMsg_CreateWindow(widget_));
   SendBoundsChange();
 }