| Index: ui/aura/window_tree_host_x11.h
|
| diff --git a/ui/aura/window_tree_host_x11.h b/ui/aura/window_tree_host_x11.h
|
| deleted file mode 100644
|
| index 1c05bf04ab6e58f3e48b8ddee3a9d7e99192d611..0000000000000000000000000000000000000000
|
| --- a/ui/aura/window_tree_host_x11.h
|
| +++ /dev/null
|
| @@ -1,117 +0,0 @@
|
| -// Copyright (c) 2012 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.
|
| -
|
| -#ifndef UI_AURA_WINDOW_TREE_HOST_X11_H_
|
| -#define UI_AURA_WINDOW_TREE_HOST_X11_H_
|
| -
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "ui/aura/aura_export.h"
|
| -#include "ui/aura/window_tree_host.h"
|
| -#include "ui/events/event_source.h"
|
| -#include "ui/events/platform/platform_event_dispatcher.h"
|
| -#include "ui/gfx/insets.h"
|
| -#include "ui/gfx/rect.h"
|
| -#include "ui/gfx/x/x11_atom_cache.h"
|
| -
|
| -// X forward decls to avoid including Xlib.h in a header file.
|
| -typedef struct _XDisplay XDisplay;
|
| -typedef unsigned long XID;
|
| -typedef XID Window;
|
| -
|
| -namespace ui {
|
| -class MouseEvent;
|
| -}
|
| -
|
| -namespace aura {
|
| -
|
| -namespace internal {
|
| -class TouchEventCalibrate;
|
| -}
|
| -
|
| -class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
|
| - public ui::EventSource,
|
| - public ui::PlatformEventDispatcher {
|
| -
|
| - public:
|
| - explicit WindowTreeHostX11(const gfx::Rect& bounds);
|
| - virtual ~WindowTreeHostX11();
|
| -
|
| - // ui::PlatformEventDispatcher:
|
| - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
|
| - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
|
| -
|
| - // WindowTreeHost:
|
| - virtual ui::EventSource* GetEventSource() override;
|
| - virtual gfx::AcceleratedWidget GetAcceleratedWidget() override;
|
| - virtual void Show() override;
|
| - virtual void Hide() override;
|
| - virtual gfx::Rect GetBounds() const override;
|
| - virtual void SetBounds(const gfx::Rect& bounds) override;
|
| - virtual gfx::Point GetLocationOnNativeScreen() const override;
|
| - virtual void SetCapture() override;
|
| - virtual void ReleaseCapture() override;
|
| - virtual void PostNativeEvent(const base::NativeEvent& event) override;
|
| - virtual void SetCursorNative(gfx::NativeCursor cursor_type) override;
|
| - virtual void MoveCursorToNative(const gfx::Point& location) override;
|
| - virtual void OnCursorVisibilityChangedNative(bool show) override;
|
| -
|
| - // ui::EventSource overrides.
|
| - virtual ui::EventProcessor* GetEventProcessor() override;
|
| -
|
| - protected:
|
| - // Called when X Configure Notify event is recevied.
|
| - virtual void OnConfigureNotify();
|
| -
|
| - // Translates the native mouse location into screen coordinates and
|
| - // dispatches the event via WindowEventDispatcher.
|
| - virtual void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event);
|
| -
|
| - ::Window x_root_window() { return x_root_window_; }
|
| - XDisplay* xdisplay() { return xdisplay_; }
|
| - const gfx::Rect bounds() const { return bounds_; }
|
| - ui::X11AtomCache* atom_cache() { return &atom_cache_; }
|
| -
|
| - private:
|
| - // Dispatches XI2 events. Note that some events targetted for the X root
|
| - // window are dispatched to the aura root window (e.g. touch events after
|
| - // calibration).
|
| - void DispatchXI2Event(const base::NativeEvent& event);
|
| -
|
| - // Sets the cursor on |xwindow_| to |cursor|. Does not check or update
|
| - // |current_cursor_|.
|
| - void SetCursorInternal(gfx::NativeCursor cursor);
|
| -
|
| - // The display and the native X window hosting the root window.
|
| - XDisplay* xdisplay_;
|
| - ::Window xwindow_;
|
| -
|
| - // The native root window.
|
| - ::Window x_root_window_;
|
| -
|
| - // Current Aura cursor.
|
| - gfx::NativeCursor current_cursor_;
|
| -
|
| - // Is the window mapped to the screen?
|
| - bool window_mapped_;
|
| -
|
| - // The bounds of |xwindow_|.
|
| - gfx::Rect bounds_;
|
| -
|
| - scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_;
|
| -
|
| - ui::X11AtomCache atom_cache_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(WindowTreeHostX11);
|
| -};
|
| -
|
| -namespace test {
|
| -
|
| -// Set the default value of the override redirect flag used to
|
| -// create a X window for WindowTreeHostX11.
|
| -AURA_EXPORT void SetUseOverrideRedirectWindowByDefault(bool override_redirect);
|
| -
|
| -} // namespace test
|
| -} // namespace aura
|
| -
|
| -#endif // UI_AURA_WINDOW_TREE_HOST_X11_H_
|
|
|