Move Ozone X11 files into ui/ozone/platform/x11

This CL moves implementation files for Ozone X11 into a more appropriate
location in ui/ozone/platform/x11, instead of ui/platform_window/x11.

Bug: 707406
Change-Id: If5673cc5283bb523eb5b8b1a8aa4d0b97133ea94
Reviewed-on: https://chromium-review.googlesource.com/941481Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539920}

ui/ozone/platform/x11/BUILD.gn

@@ -18,14 +18,21 @@ source_set("x11") {
     "ozone_platform_x11.h",
     "x11_cursor_factory_ozone.cc",
     "x11_cursor_factory_ozone.h",
+    "x11_cursor_ozone.cc",
+    "x11_cursor_ozone.h",
     "x11_surface_factory.cc",
     "x11_surface_factory.h",
+    "x11_window_manager_ozone.cc",
+    "x11_window_manager_ozone.h",
+    "x11_window_ozone.cc",
+    "x11_window_ozone.h",
   ]
 
   deps = [
     "//base",
     "//skia",
     "//ui/base",
+    "//ui/base/x",
     "//ui/display/manager",
     "//ui/events",
     "//ui/events/devices",

ui/ozone/platform/x11/ozone_platform_x11.cc

@@ -19,12 +19,12 @@
 #include "ui/ozone/common/stub_overlay_manager.h"
 #include "ui/ozone/platform/x11/x11_cursor_factory_ozone.h"
 #include "ui/ozone/platform/x11/x11_surface_factory.h"
+#include "ui/ozone/platform/x11/x11_window_manager_ozone.h"
+#include "ui/ozone/platform/x11/x11_window_ozone.h"
 #include "ui/ozone/public/gpu_platform_support_host.h"
 #include "ui/ozone/public/input_controller.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/platform_window/platform_window.h"
-#include "ui/platform_window/x11/x11_window_manager_ozone.h"
-#include "ui/platform_window/x11/x11_window_ozone.h"
 
 namespace ui {
 

ui/ozone/platform/x11/x11_cursor_factory_ozone.h

@@ -12,8 +12,8 @@
 #include "base/macros.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/gfx/x/x11.h"
+#include "ui/ozone/platform/x11/x11_cursor_ozone.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
-#include "ui/platform_window/x11/x11_cursor_ozone.h"
 
 namespace ui {
 

ui/platform_window/x11/x11_cursor_ozone.cc → ui/ozone/platform/x11/x11_cursor_ozone.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/platform_window/x11/x11_cursor_ozone.h"
+#include "ui/ozone/platform/x11/x11_cursor_ozone.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"

ui/platform_window/x11/x11_cursor_ozone.h → ui/ozone/platform/x11/x11_cursor_ozone.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_PLATFORM_WINDOW_X11_X11_CURSOR_OZONE_H_
-#define UI_PLATFORM_WINDOW_X11_X11_CURSOR_OZONE_H_
+#ifndef UI_OZONE_PLATFORM_X11_X11_CURSOR_OZONE_H_
+#define UI_OZONE_PLATFORM_X11_X11_CURSOR_OZONE_H_
 
 #include <vector>
 
@@ -11,7 +11,6 @@
 #include "base/memory/ref_counted.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/gfx/x/x11.h"
-#include "ui/platform_window/x11/x11_window_export.h"
 
 class SkBitmap;
 
@@ -23,8 +22,7 @@ namespace ui {
 
 // Ref counted class to hold an X11 cursor resource. Handles creating X11 cursor
 // resources from SkBitmap/hotspot and clears the X11 resources on destruction.
-class X11_WINDOW_EXPORT X11CursorOzone
-    : public base::RefCounted<X11CursorOzone> {
+class X11CursorOzone : public base::RefCounted<X11CursorOzone> {
  public:
   X11CursorOzone(const SkBitmap& bitmap, const gfx::Point& hotspot);
   X11CursorOzone(const std::vector<SkBitmap>& bitmaps,
@@ -34,7 +32,7 @@ class X11_WINDOW_EXPORT X11CursorOzone
   // Creates a new cursor that is invisible.
   static scoped_refptr<X11CursorOzone> CreateInvisible();
 
-  ::Cursor xcursor() const { return xcursor_; }
+  XID xcursor() const { return xcursor_; }
 
  private:
   friend class base::RefCounted<X11CursorOzone>;
@@ -42,10 +40,11 @@ class X11_WINDOW_EXPORT X11CursorOzone
   X11CursorOzone();
   ~X11CursorOzone();
 
-  ::Cursor xcursor_ = x11::None;
+  XID xcursor_ = x11::None;
 
   DISALLOW_COPY_AND_ASSIGN(X11CursorOzone);
 };
 
 }  // namespace ui
-#endif  // UI_PLATFORM_WINDOW_X11_X11_CURSOR_OZONE_H_
+
+#endif  // UI_OZONE_PLATFORM_X11_X11_CURSOR_OZONE_H_

ui/platform_window/x11/x11_window_manager_ozone.cc → ui/ozone/platform/x11/x11_window_manager_ozone.cc

@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/platform_window/x11/x11_window_manager_ozone.h"
+#include "ui/ozone/platform/x11/x11_window_manager_ozone.h"
+
+#include "ui/ozone/platform/x11/x11_window_ozone.h"
 
 namespace ui {
 

ui/platform_window/x11/x11_window_manager_ozone.h → ui/ozone/platform/x11/x11_window_manager_ozone.h

@@ -2,17 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_PLATFORM_WINDOW_X11_X11_WINDOW_MANAGER_OZONE_H_
-#define UI_PLATFORM_WINDOW_X11_X11_WINDOW_MANAGER_OZONE_H_
+#ifndef UI_OZONE_PLATFORM_X11_X11_WINDOW_MANAGER_OZONE_H_
+#define UI_OZONE_PLATFORM_X11_X11_WINDOW_MANAGER_OZONE_H_
 
 #include "base/macros.h"
-#include "ui/platform_window/x11/x11_window_export.h"
 
 namespace ui {
 
 class X11WindowOzone;
 
-class X11_WINDOW_EXPORT X11WindowManagerOzone {
+class X11WindowManagerOzone {
  public:
   X11WindowManagerOzone();
   ~X11WindowManagerOzone();
@@ -35,4 +34,4 @@ class X11_WINDOW_EXPORT X11WindowManagerOzone {
 
 }  // namespace ui
 
-#endif  // UI_PLATFORM_WINDOW_X11_X11_WINDOW_MANAGER_OZONE_H_
+#endif  // UI_OZONE_PLATFORM_X11_X11_WINDOW_MANAGER_OZONE_H_

ui/platform_window/x11/x11_window_ozone.cc → ui/ozone/platform/x11/x11_window_ozone.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/platform_window/x11/x11_window_ozone.h"
+#include "ui/ozone/platform/x11/x11_window_ozone.h"
 
 #include "base/bind.h"
 #include "ui/events/event.h"
@@ -10,8 +10,8 @@
 #include "ui/events/platform/x11/x11_event_source.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/x/x11.h"
-#include "ui/platform_window/x11/x11_cursor_ozone.h"
-#include "ui/platform_window/x11/x11_window_manager_ozone.h"
+#include "ui/ozone/platform/x11/x11_cursor_ozone.h"
+#include "ui/ozone/platform/x11/x11_window_manager_ozone.h"
 
 namespace ui {
 

ui/platform_window/x11/x11_window_ozone.h → ui/ozone/platform/x11/x11_window_ozone.h

@@ -2,23 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_PLATFORM_WINDOW_X11_X11_WINDOW_OZONE_H_
-#define UI_PLATFORM_WINDOW_X11_X11_WINDOW_OZONE_H_
+#ifndef UI_OZONE_PLATFORM_X11_X11_WINDOW_OZONE_H_
+#define UI_OZONE_PLATFORM_X11_X11_WINDOW_OZONE_H_
 
 #include "base/macros.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/events/platform/x11/x11_event_source_libevent.h"
 #include "ui/platform_window/x11/x11_window_base.h"
-#include "ui/platform_window/x11/x11_window_export.h"
 
 namespace ui {
 
 class X11WindowManagerOzone;
 
 // PlatformWindow implementation for X11 Ozone. PlatformEvents are ui::Events.
-class X11_WINDOW_EXPORT X11WindowOzone : public X11WindowBase,
-                                         public PlatformEventDispatcher,
-                                         public XEventDispatcher {
+class X11WindowOzone : public X11WindowBase,
+                       public PlatformEventDispatcher,
+                       public XEventDispatcher {
  public:
   X11WindowOzone(X11WindowManagerOzone* window_manager,
                  PlatformWindowDelegate* delegate,
@@ -54,4 +53,4 @@ class X11_WINDOW_EXPORT X11WindowOzone : public X11WindowBase,
 
 }  // namespace ui
 
-#endif  // UI_PLATFORM_WINDOW_X11_X11_WINDOW_OZONE_H_
+#endif  // UI_OZONE_PLATFORM_X11_X11_WINDOW_OZONE_H_

ui/platform_window/x11/BUILD.gn

@@ -34,20 +34,7 @@ jumbo_component("x11") {
     "x11_window_export.h",
   ]
 
-  if (ozone_platform_x11) {
-    sources += [
-      "x11_cursor_ozone.cc",
-      "x11_cursor_ozone.h",
-      "x11_window_manager_ozone.cc",
-      "x11_window_manager_ozone.h",
-      "x11_window_ozone.cc",
-      "x11_window_ozone.h",
-    ]
-    deps += [
-      "//ui/base",
-      "//ui/base/x",
-    ]
-  } else if (use_x11) {
+  if (use_x11) {
     sources += [
       "x11_window.cc",
       "x11_window.h",