| Index: ui/aura/window_event_dispatcher.cc
|
| diff --git a/ui/aura/window_event_dispatcher.cc b/ui/aura/window_event_dispatcher.cc
|
| index 82d1ef6a4679af13617fb83f2df334c8bb854f57..170d51345eabd2dc8a974e90f79a11e95335212e 100644
|
| --- a/ui/aura/window_event_dispatcher.cc
|
| +++ b/ui/aura/window_event_dispatcher.cc
|
| @@ -299,9 +299,17 @@ void WindowEventDispatcher::OnCursorMovedToRootLocation(
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // WindowEventDispatcher, private:
|
|
|
| +Window* WindowEventDispatcher::window() {
|
| + return host_->window();
|
| +}
|
| +
|
| +const Window* WindowEventDispatcher::window() const {
|
| + return host_->window();
|
| +}
|
| +
|
| void WindowEventDispatcher::TransformEventForDeviceScaleFactor(
|
| ui::LocatedEvent* event) {
|
| - event->UpdateForRootTransform(host()->GetInverseRootTransform());
|
| + event->UpdateForRootTransform(host_->GetInverseRootTransform());
|
| }
|
|
|
| ui::EventDispatchDetails WindowEventDispatcher::DispatchMouseEnterOrExit(
|
| @@ -637,7 +645,7 @@ ui::EventDispatchDetails WindowEventDispatcher::SynthesizeMouseMoveEvent() {
|
| if (!window()->bounds().Contains(root_mouse_location))
|
| return details;
|
| gfx::Point host_mouse_location = root_mouse_location;
|
| - host()->ConvertPointToHost(&host_mouse_location);
|
| + host_->ConvertPointToHost(&host_mouse_location);
|
| ui::MouseEvent event(ui::ET_MOUSE_MOVED,
|
| host_mouse_location,
|
| host_mouse_location,
|
|
|