| Index: ui/aura/window_tree_host.cc
|
| diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc
|
| index 1e2db75517902ee2f789ac34ee774236909b6fe0..fcbb9af71a7c59faca7983a35a71db25bd4d5f3e 100644
|
| --- a/ui/aura/window_tree_host.cc
|
| +++ b/ui/aura/window_tree_host.cc
|
| @@ -71,8 +71,8 @@ void WindowTreeHost::RemoveObserver(WindowTreeHostObserver* observer) {
|
| observers_.RemoveObserver(observer);
|
| }
|
|
|
| -ui::EventProcessor* WindowTreeHost::event_processor() {
|
| - return dispatcher();
|
| +ui::EventSink* WindowTreeHost::event_sink() {
|
| + return dispatcher_.get();
|
| }
|
|
|
| gfx::Transform WindowTreeHost::GetRootTransform() const {
|
| @@ -194,7 +194,7 @@ void WindowTreeHost::SetSharedInputMethod(ui::InputMethod* input_method) {
|
|
|
| ui::EventDispatchDetails WindowTreeHost::DispatchKeyEventPostIME(
|
| ui::KeyEvent* event) {
|
| - return SendEventToProcessor(event);
|
| + return SendEventToSink(event);
|
| }
|
|
|
| void WindowTreeHost::Show() {
|
| @@ -329,8 +329,8 @@ gfx::ICCProfile WindowTreeHost::GetICCProfileForCurrentDisplay() {
|
| return gfx::ICCProfile::FromBestMonitor();
|
| }
|
|
|
| -ui::EventProcessor* WindowTreeHost::GetEventProcessor() {
|
| - return event_processor();
|
| +ui::EventSink* WindowTreeHost::GetEventSink() {
|
| + return dispatcher_.get();
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|