| Index: ui/aura/root_window.cc | 
| diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc | 
| index b261a2a20d442b970f87a071500477c737cf7206..386cdac72900f739ccf2c400482d0ba1a3444ea6 100644 | 
| --- a/ui/aura/root_window.cc | 
| +++ b/ui/aura/root_window.cc | 
| @@ -1036,13 +1036,9 @@ bool RootWindow::DispatchMouseEventToTarget(ui::MouseEvent* event, | 
| break; | 
| } | 
| if (target) { | 
| -    int flags = event->flags(); | 
| -    gfx::Point location_in_window = event->location(); | 
| -    Window::ConvertPointToTarget(this, target, &location_in_window); | 
| -    if (IsNonClientLocation(target, location_in_window)) | 
| -      flags |= ui::EF_IS_NON_CLIENT; | 
| -    event->set_flags(flags); | 
| event->ConvertLocationToTarget(static_cast<Window*>(this), target); | 
| +    if (IsNonClientLocation(target, event->location())) | 
| +      event->set_flags(event->flags() | ui::EF_IS_NON_CLIENT); | 
| return ProcessMouseEvent(target, event); | 
| } | 
| return false; | 
|  |