Chromium Code Reviews| Index: ui/aura/root_window.cc |
| =================================================================== |
| --- ui/aura/root_window.cc (revision 163961) |
| +++ ui/aura/root_window.cc (working copy) |
| @@ -145,7 +145,8 @@ |
| mouse_move_hold_count_(0), |
| ALLOW_THIS_IN_INITIALIZER_LIST(held_mouse_event_factory_(this)), |
| compositor_lock_(NULL), |
| - draw_on_compositor_unlock_(false) { |
| + draw_on_compositor_unlock_(false), |
| + parent_event_target_(NULL) { |
| SetName("RootWindow"); |
| compositor_.reset(new ui::Compositor(this, host_->GetAcceleratedWidget())); |
| @@ -485,6 +486,8 @@ |
| // RootWindow, ui::EventTarget implementation: |
| ui::EventTarget* RootWindow::GetParentTarget() { |
| + if (parent_event_target_) |
|
Ben Goodger (Google)
2012/10/26 21:51:57
instead of doing this can we add a method to ui/au
ananta
2012/10/26 22:28:41
Done.
|
| + return parent_event_target_; |
| return Env::GetInstance(); |
| } |