[Ozone] Migrate platform DRI & GBM to platform_window

ui/ozone/platform/dri/dri_window.h

Index: ui/ozone/platform/dri/dri_window.h
diff --git a/ui/ozone/common/window/platform_window_compat.h b/ui/ozone/platform/dri/dri_window.h
similarity index 51%
rename from ui/ozone/common/window/platform_window_compat.h
rename to ui/ozone/platform/dri/dri_window.h
index 503a2de42aa72f8a1088f7c252e8349de3654eca..6177f79a7637a9c5a91b68c397e7cbfd45109e78 100644
--- a/ui/ozone/common/window/platform_window_compat.h
+++ b/ui/ozone/platform/dri/dri_window.h
@@ -2,43 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_COMMON_WINDOW_PLATFORM_WINDOW_COMPAT_H_
-#define UI_OZONE_COMMON_WINDOW_PLATFORM_WINDOW_COMPAT_H_
+#ifndef UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
+#define UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
 
-#include "ui/base/cursor/cursor.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/ozone/ozone_export.h"
 #include "ui/platform_window/platform_window.h"
 
-namespace gfx {
-class Point;
-class Rect;
-}
-
 namespace ui {
 
-class PlatformWindowDelegate;
-
-// This is just transitional code. Will be removed shortly.
-class OZONE_EXPORT PlatformWindowCompat : public PlatformWindow,
-                                          public ui::PlatformEventDispatcher {
+class DriWindow : public PlatformWindow,
+                  public PlatformEventDispatcher {
  public:
-  PlatformWindowCompat(PlatformWindowDelegate* delegate,
-                       const gfx::Rect& bounds);
-  virtual ~PlatformWindowCompat();
-
-  // ui::PlatformEventDispatcher:
-  virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
-  virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
+  DriWindow(PlatformWindowDelegate* delegate,
+            const gfx::Rect& bounds);
+  virtual ~DriWindow();
 
   // PlatformWindow:
-  virtual gfx::Rect GetBounds() OVERRIDE;
-  virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual void Close() OVERRIDE;
+  virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
+  virtual gfx::Rect GetBounds() OVERRIDE;
   virtual void SetCapture() OVERRIDE;
   virtual void ReleaseCapture() OVERRIDE;
   virtual void ToggleFullscreen() OVERRIDE;
@@ -46,14 +32,18 @@ class OZONE_EXPORT PlatformWindowCompat : public PlatformWindow,
   virtual void Minimize() OVERRIDE;
   virtual void Restore() OVERRIDE;
 
+  // PlatformEventDispatcher:
+  virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE;
+  virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE;
+
  private:
   PlatformWindowDelegate* delegate_;
-  gfx::AcceleratedWidget widget_;
   gfx::Rect bounds_;
+  gfx::AcceleratedWidget widget_;
 
-  DISALLOW_COPY_AND_ASSIGN(PlatformWindowCompat);
+  DISALLOW_COPY_AND_ASSIGN(DriWindow);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_COMMON_WINDOW_PLATFORM_WINDOW_COMPAT_H_
+#endif  // UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_