| Index: ash/display/event_transformation_handler.cc
|
| diff --git a/ash/display/event_transformation_handler.cc b/ash/display/event_transformation_handler.cc
|
| index 62a6fa15cf2d381cc51d363ca2bba42196175870..e1af21fca07e789f6752f2fa6485bf966c292e4d 100644
|
| --- a/ash/display/event_transformation_handler.cc
|
| +++ b/ash/display/event_transformation_handler.cc
|
| @@ -9,7 +9,6 @@
|
| #include "ash/display/display_info.h"
|
| #include "ash/display/display_manager.h"
|
| #include "ash/shell.h"
|
| -#include "ash/wm/coordinate_conversion.h"
|
| #include "ash/wm/window_util.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_event_dispatcher.h"
|
| @@ -17,6 +16,7 @@
|
| #include "ui/events/event.h"
|
| #include "ui/gfx/display.h"
|
| #include "ui/gfx/screen.h"
|
| +#include "ui/wm/core/coordinate_conversion.h"
|
|
|
| namespace ash {
|
| namespace {
|
| @@ -41,7 +41,7 @@ void EventTransformationHandler::OnScrollEvent(ui::ScrollEvent* event) {
|
| // the event locations etc. are already in DIP.
|
| gfx::Point point_in_screen(event->location());
|
| aura::Window* target = static_cast<aura::Window*>(event->target());
|
| - wm::ConvertPointToScreen(target, &point_in_screen);
|
| + ::wm::ConvertPointToScreen(target, &point_in_screen);
|
| const gfx::Display& display =
|
| Shell::GetScreen()->GetDisplayNearestPoint(point_in_screen);
|
|
|
|
|