Register a separate default ui::EventTarget for Aura (Ash) to ensure that it does not interfere wit…

ui/aura/root_window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/root_window.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 127 matching lines @@
       focus_manager_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           gesture_recognizer_(ui::GestureRecognizer::Create(this))),
       synthesize_mouse_move_(false),
       waiting_on_compositing_end_(false),
       draw_on_compositing_end_(false),
       defer_draw_scheduling_(false),
       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()));
   DCHECK(compositor_.get());
   compositor_->AddObserver(this);
 
   prop_.reset(new ui::ViewProp(host_->GetAcceleratedWidget(),
                                kRootWindowForAcceleratedWidget,
                                this));
 }
@@ skipping 319 matching lines @@
   // If the layer is not animating, then we need to update the host size
   // immediately.
   if (!layer()->GetAnimator()->is_animating())
     OnHostResized(host_->GetBounds().size());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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/aura/client/event_client.h's
EventClient interface:

virtual ui::EventTarget* GetToplevelEventTarget() = 0;

and implement in ash/wm/event_client_impl.cc to return Shell::GetInstance();

This code then becomes:

return client::GetEventClient(this) ?
client::GetEventClient(this)->GetParentEventTarget() : Env::GetInstance();

and we can avoid adding state to the root window.

[ananta, 2012/10/26 22:28:41]

Done.

+    return parent_event_target_;
   return Env::GetInstance();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, ui::CompositorDelegate implementation:
 
 void RootWindow::ScheduleDraw() {
   if (compositor_lock_) {
     draw_on_compositor_unlock_ = true;
   } else if (!defer_draw_scheduling_) {
@@ skipping 573 matching lines @@
 void RootWindow::UnlockCompositor() {
   DCHECK(compositor_lock_);
   compositor_lock_ = NULL;
   if (draw_on_compositor_unlock_) {
     draw_on_compositor_unlock_ = false;
     ScheduleDraw();
   }
 }
 
 }  // namespace aura