summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mojo/examples/aura_demo/window_tree_host_mojo.cc4
-rw-r--r--mojo/examples/aura_demo/window_tree_host_mojo.h1
-rw-r--r--ui/aura/remote_window_tree_host_win.cc4
-rw-r--r--ui/aura/remote_window_tree_host_win.h1
-rw-r--r--ui/aura/window_tree_host.h5
-rw-r--r--ui/aura/window_tree_host_mac.h1
-rw-r--r--ui/aura/window_tree_host_mac.mm5
-rw-r--r--ui/aura/window_tree_host_ozone.cc4
-rw-r--r--ui/aura/window_tree_host_ozone.h1
-rw-r--r--ui/aura/window_tree_host_win.cc4
-rw-r--r--ui/aura/window_tree_host_win.h1
-rw-r--r--ui/aura/window_tree_host_x11.cc4
-rw-r--r--ui/aura/window_tree_host_x11.h1
-rw-r--r--ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc4
-rw-r--r--ui/views/widget/desktop_aura/desktop_window_tree_host_win.h1
-rw-r--r--ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc4
-rw-r--r--ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h2
17 files changed, 47 insertions, 0 deletions
diff --git a/mojo/examples/aura_demo/window_tree_host_mojo.cc b/mojo/examples/aura_demo/window_tree_host_mojo.cc
index 7a5bd4e..5d935cd 100644
--- a/mojo/examples/aura_demo/window_tree_host_mojo.cc
+++ b/mojo/examples/aura_demo/window_tree_host_mojo.cc
@@ -56,6 +56,10 @@ WindowTreeHostMojo::~WindowTreeHostMojo() {}
////////////////////////////////////////////////////////////////////////////////
// WindowTreeHostMojo, aura::WindowTreeHost implementation:
+ui::EventSource* WindowTreeHostMojo::GetEventSource() {
+ return this;
+}
+
gfx::AcceleratedWidget WindowTreeHostMojo::GetAcceleratedWidget() {
NOTIMPLEMENTED() << "GetAcceleratedWidget";
return gfx::kNullAcceleratedWidget;
diff --git a/mojo/examples/aura_demo/window_tree_host_mojo.h b/mojo/examples/aura_demo/window_tree_host_mojo.h
index 80d178c..3fca9f7 100644
--- a/mojo/examples/aura_demo/window_tree_host_mojo.h
+++ b/mojo/examples/aura_demo/window_tree_host_mojo.h
@@ -33,6 +33,7 @@ class WindowTreeHostMojo : public aura::WindowTreeHost,
private:
// WindowTreeHost:
+ virtual ui::EventSource* GetEventSource() OVERRIDE;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
virtual void Show() OVERRIDE;
virtual void Hide() OVERRIDE;
diff --git a/ui/aura/remote_window_tree_host_win.cc b/ui/aura/remote_window_tree_host_win.cc
index 6525588..314f9c39 100644
--- a/ui/aura/remote_window_tree_host_win.cc
+++ b/ui/aura/remote_window_tree_host_win.cc
@@ -373,6 +373,10 @@ Window* RemoteWindowTreeHostWin::GetAshWindow() {
return window();
}
+ui::EventSource* RemoteWindowTreeHostWin::GetEventSource() {
+ return this;
+}
+
gfx::AcceleratedWidget RemoteWindowTreeHostWin::GetAcceleratedWidget() {
if (remote_window_)
return remote_window_;
diff --git a/ui/aura/remote_window_tree_host_win.h b/ui/aura/remote_window_tree_host_win.h
index 887f01f..2ba8b79 100644
--- a/ui/aura/remote_window_tree_host_win.h
+++ b/ui/aura/remote_window_tree_host_win.h
@@ -222,6 +222,7 @@ class AURA_EXPORT RemoteWindowTreeHostWin
void OnImeInputSourceChanged(uint16 language_id, bool is_ime);
// WindowTreeHost overrides:
+ virtual ui::EventSource* GetEventSource() OVERRIDE;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
virtual void Show() OVERRIDE;
virtual void Hide() OVERRIDE;
diff --git a/ui/aura/window_tree_host.h b/ui/aura/window_tree_host.h
index 55d119e..8e9bbd4 100644
--- a/ui/aura/window_tree_host.h
+++ b/ui/aura/window_tree_host.h
@@ -11,6 +11,7 @@
#include "base/message_loop/message_loop.h"
#include "ui/aura/aura_export.h"
#include "ui/base/cursor/cursor.h"
+#include "ui/events/event_source.h"
#include "ui/gfx/native_widget_types.h"
namespace gfx {
@@ -111,6 +112,10 @@ class AURA_EXPORT WindowTreeHost {
gfx::NativeCursor last_cursor() const { return last_cursor_; }
+ // Returns the EventSource responsible for dispatching events to the window
+ // tree.
+ virtual ui::EventSource* GetEventSource() = 0;
+
// Returns the accelerated widget.
virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0;
diff --git a/ui/aura/window_tree_host_mac.h b/ui/aura/window_tree_host_mac.h
index 8650981..82493a9 100644
--- a/ui/aura/window_tree_host_mac.h
+++ b/ui/aura/window_tree_host_mac.h
@@ -30,6 +30,7 @@ class AURA_EXPORT WindowTreeHostMac : public WindowTreeHost {
private:
// WindowTreeHost Overrides.
+ virtual ui::EventSource* GetEventSource() OVERRIDE;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
virtual void Show() OVERRIDE;
virtual void Hide() OVERRIDE;
diff --git a/ui/aura/window_tree_host_mac.mm b/ui/aura/window_tree_host_mac.mm
index dbfa8bb..020aabd 100644
--- a/ui/aura/window_tree_host_mac.mm
+++ b/ui/aura/window_tree_host_mac.mm
@@ -23,6 +23,11 @@ WindowTreeHostMac::~WindowTreeHostMac() {
DestroyDispatcher();
}
+EventSource* WindowTreeHostMac::GetEventSource() {
+ NOTIMPLEMENTED();
+ return nil;
+}
+
gfx::AcceleratedWidget WindowTreeHostMac::GetAcceleratedWidget() {
return [window_ contentView];
}
diff --git a/ui/aura/window_tree_host_ozone.cc b/ui/aura/window_tree_host_ozone.cc
index f2117cb..d461182 100644
--- a/ui/aura/window_tree_host_ozone.cc
+++ b/ui/aura/window_tree_host_ozone.cc
@@ -51,6 +51,10 @@ uint32_t WindowTreeHostOzone::DispatchEvent(const ui::PlatformEvent& ne) {
return ui::POST_DISPATCH_STOP_PROPAGATION;
}
+ui::EventSource* WindowTreeHostOzone::GetEventSource() {
+ return this;
+}
+
gfx::AcceleratedWidget WindowTreeHostOzone::GetAcceleratedWidget() {
return widget_;
}
diff --git a/ui/aura/window_tree_host_ozone.h b/ui/aura/window_tree_host_ozone.h
index 1e1d526..a2c0746 100644
--- a/ui/aura/window_tree_host_ozone.h
+++ b/ui/aura/window_tree_host_ozone.h
@@ -29,6 +29,7 @@ class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,
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;
diff --git a/ui/aura/window_tree_host_win.cc b/ui/aura/window_tree_host_win.cc
index 5f1dc00..9bbb44b 100644
--- a/ui/aura/window_tree_host_win.cc
+++ b/ui/aura/window_tree_host_win.cc
@@ -55,6 +55,10 @@ WindowTreeHostWin::~WindowTreeHostWin() {
DestroyWindow(hwnd());
}
+ui::EventSource* WindowTreeHostWin::GetEventSource() {
+ return this;
+}
+
gfx::AcceleratedWidget WindowTreeHostWin::GetAcceleratedWidget() {
return hwnd();
}
diff --git a/ui/aura/window_tree_host_win.h b/ui/aura/window_tree_host_win.h
index dc5f46c..9625b28 100644
--- a/ui/aura/window_tree_host_win.h
+++ b/ui/aura/window_tree_host_win.h
@@ -20,6 +20,7 @@ class AURA_EXPORT WindowTreeHostWin : public WindowTreeHost,
explicit WindowTreeHostWin(const gfx::Rect& bounds);
virtual ~WindowTreeHostWin();
// WindowTreeHost:
+ virtual ui::EventSource* GetEventSource() OVERRIDE;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
virtual void Show() OVERRIDE;
virtual void Hide() OVERRIDE;
diff --git a/ui/aura/window_tree_host_x11.cc b/ui/aura/window_tree_host_x11.cc
index 6fa75e7..bd897d9 100644
--- a/ui/aura/window_tree_host_x11.cc
+++ b/ui/aura/window_tree_host_x11.cc
@@ -343,6 +343,10 @@ uint32_t WindowTreeHostX11::DispatchEvent(const ui::PlatformEvent& event) {
return ui::POST_DISPATCH_STOP_PROPAGATION;
}
+ui::EventSource* WindowTreeHostX11::GetEventSource() {
+ return this;
+}
+
gfx::AcceleratedWidget WindowTreeHostX11::GetAcceleratedWidget() {
return xwindow_;
}
diff --git a/ui/aura/window_tree_host_x11.h b/ui/aura/window_tree_host_x11.h
index 69a7368..67ec4b2 100644
--- a/ui/aura/window_tree_host_x11.h
+++ b/ui/aura/window_tree_host_x11.h
@@ -42,6 +42,7 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
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;
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index ebbd14b..16987e9 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -436,6 +436,10 @@ bool DesktopWindowTreeHostWin::IsAnimatingClosed() const {
////////////////////////////////////////////////////////////////////////////////
// DesktopWindowTreeHostWin, WindowTreeHost implementation:
+ui::EventSource* DesktopWindowTreeHostWin::GetEventSource() {
+ return this;
+}
+
gfx::AcceleratedWidget DesktopWindowTreeHostWin::GetAcceleratedWidget() {
return message_handler_->hwnd();
}
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
index 95044e3..bc6035a 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -106,6 +106,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
virtual bool IsAnimatingClosed() const OVERRIDE;
// Overridden from aura::WindowTreeHost:
+ virtual ui::EventSource* GetEventSource() OVERRIDE;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
virtual void Show() OVERRIDE;
virtual void Hide() OVERRIDE;
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index efd24b6..386aa8b 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -765,6 +765,10 @@ bool DesktopWindowTreeHostX11::IsAnimatingClosed() const {
////////////////////////////////////////////////////////////////////////////////
// DesktopWindowTreeHostX11, aura::WindowTreeHost implementation:
+ui::EventSource* DesktopWindowTreeHostX11::GetEventSource() {
+ return this;
+}
+
gfx::AcceleratedWidget DesktopWindowTreeHostX11::GetAcceleratedWidget() {
return xwindow_;
}
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
index f08d207..0522d9a 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -13,6 +13,7 @@
#include "base/observer_list.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/cursor/cursor_loader_x11.h"
+#include "ui/events/event_source.h"
#include "ui/events/platform/platform_event_dispatcher.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/x/x11_atom_cache.h"
@@ -130,6 +131,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
virtual bool IsAnimatingClosed() const OVERRIDE;
// Overridden from aura::WindowTreeHost:
+ virtual ui::EventSource* GetEventSource() OVERRIDE;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
virtual void Show() OVERRIDE;
virtual void Hide() OVERRIDE;
generated by cgit v1.1 at 2025-01-10 23:47:06 +0000