Index: ui/ozone/platform/test/test_window.h |
diff --git a/ui/ozone/common/window/platform_window_compat.h b/ui/ozone/platform/test/test_window.h |
similarity index 53% |
copy from ui/ozone/common/window/platform_window_compat.h |
copy to ui/ozone/platform/test/test_window.h |
index 503a2de42aa72f8a1088f7c252e8349de3654eca..4f7a677d73d7c21909dd28e80fb0999a035b38ef 100644 |
--- a/ui/ozone/common/window/platform_window_compat.h |
+++ b/ui/ozone/platform/test/test_window.h |
@@ -2,36 +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_TEST_TEST_WINDOW_H_ |
+#define UI_OZONE_PLATFORM_TEST_TEST_WINDOW_H_ |
-#include "ui/base/cursor/cursor.h" |
+#include "base/files/file_path.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; |
+class TestWindowManager; |
-// This is just transitional code. Will be removed shortly. |
-class OZONE_EXPORT PlatformWindowCompat : public PlatformWindow, |
- public ui::PlatformEventDispatcher { |
+class TestWindow : public PlatformWindow, public PlatformEventDispatcher { |
public: |
- PlatformWindowCompat(PlatformWindowDelegate* delegate, |
- const gfx::Rect& bounds); |
- virtual ~PlatformWindowCompat(); |
+ TestWindow(PlatformWindowDelegate* delegate, |
+ TestWindowManager* manager, |
+ const gfx::Rect& bounds); |
+ virtual ~TestWindow(); |
- // ui::PlatformEventDispatcher: |
- virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; |
- virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; |
+ // Path for image file for this window. |
+ base::FilePath path(); |
// PlatformWindow: |
virtual gfx::Rect GetBounds() OVERRIDE; |
@@ -46,14 +39,19 @@ 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_; |
+ TestWindowManager* manager_; |
gfx::Rect bounds_; |
+ gfx::AcceleratedWidget widget_; |
- DISALLOW_COPY_AND_ASSIGN(PlatformWindowCompat); |
+ DISALLOW_COPY_AND_ASSIGN(TestWindow); |
}; |
} // namespace ui |
-#endif // UI_OZONE_COMMON_WINDOW_PLATFORM_WINDOW_COMPAT_H_ |
+#endif // UI_OZONE_PLATFORM_TEST_TEST_WINDOW_H_ |