| Index: ui/aura/window.h
|
| diff --git a/ui/aura/window.h b/ui/aura/window.h
|
| index 8d98ffa54f18ac4a39a60c308b3c2e1f09a63d41..69d4670d1ceab40ff972759736c8ef05b1c6a4e7 100644
|
| --- a/ui/aura/window.h
|
| +++ b/ui/aura/window.h
|
| @@ -282,7 +282,8 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
|
|
|
| // Returns the Window that most closely encloses |local_point| for the
|
| // purposes of event targeting.
|
| - Window* GetEventHandlerForPoint(const gfx::Point& local_point);
|
| + Window* GetEventHandlerForPoint(const gfx::Point& local_point,
|
| + ui::EventType event_type);
|
|
|
| // Returns the topmost Window with a delegate containing |local_point|.
|
| Window* GetTopWindowContainingPoint(const gfx::Point& local_point);
|
| @@ -381,11 +382,11 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
|
| // Gets a Window (either this one or a subwindow) containing |local_point|.
|
| // If |return_tightest| is true, returns the tightest-containing (i.e.
|
| // furthest down the hierarchy) Window containing the point; otherwise,
|
| - // returns the loosest. If |for_event_handling| is true, then hit-test masks
|
| - // are honored; otherwise, only bounds checks are performed.
|
| + // returns the loosest. If |event_type| is provided (!ET_UNKNOWN), then
|
| + // hit-test masks are honored; otherwise, only bounds checks are performed.
|
| Window* GetWindowForPoint(const gfx::Point& local_point,
|
| bool return_tightest,
|
| - bool for_event_handling);
|
| + ui::EventType event_type);
|
|
|
| // Implementation of RemoveChild(). If |child| is being removed as the result
|
| // of an add, |new_parent| is the new parent |child| is going to be parented
|
|
|