| Index: ash/wm/resize_handle_window_targeter.cc
|
| diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc
|
| index 358369a94c1a56c09c81889cc3a8f3beed6e896f..84743fbaf8af2c53f4edb7a0bda52dbecb32fc9e 100644
|
| --- a/ash/wm/resize_handle_window_targeter.cc
|
| +++ b/ash/wm/resize_handle_window_targeter.cc
|
| @@ -9,6 +9,7 @@
|
| #include "ash/wm/immersive_fullscreen_controller.h"
|
| #include "ash/wm/window_state_aura.h"
|
| #include "ui/aura/window.h"
|
| +#include "ui/aura/window_targeter.h"
|
| #include "ui/events/event.h"
|
|
|
| namespace ash {
|
| @@ -70,8 +71,10 @@ aura::Window* ResizeHandleWindowTargeter::FindTargetForLocatedEvent(
|
|
|
| if (!insets.IsEmpty()) {
|
| gfx::Rect bounds = gfx::Rect(window_->bounds().size());
|
| - bounds.Inset(insets);
|
| - if (!bounds.Contains(event->location()))
|
| + gfx::Rect insetBounds(bounds);
|
| + insetBounds.Inset(insets);
|
| + if (!insetBounds.Contains(event->location()) &&
|
| + !HasIndependentChildWithEvent(window, event->location(), false))
|
| return window_;
|
| }
|
| }
|
|
|