| Index: ui/aura/demo/demo_main.cc
|
| diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
|
| index 0571759829211eae39485cabf7f081c39f990f0f..45112d9d273530edf4bdbee080b93e6dbf687f13 100644
|
| --- a/ui/aura/demo/demo_main.cc
|
| +++ b/ui/aura/demo/demo_main.cc
|
| @@ -53,7 +53,8 @@ class DemoWindowDelegate : public aura::WindowDelegate {
|
| }
|
| virtual bool ShouldDescendIntoChildForEventHandling(
|
| aura::Window* child,
|
| - const gfx::Point& location) OVERRIDE {
|
| + const gfx::Point& event_location,
|
| + ui::EventType event_type) OVERRIDE {
|
| return true;
|
| }
|
| virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
|
|
|