Changes event-root to deliver-events-to-parent

services/window_manager/view_targeter.cc

 // Copyright 2014 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 "services/window_manager/view_targeter.h"
 
 #include "services/window_manager/capture_controller.h"
 #include "services/window_manager/focus_controller.h"
 #include "services/window_manager/view_target.h"
 
@@ skipping 24 matching lines @@
     ui::EventTarget* root,
     ui::LocatedEvent* event) {
   ViewTarget* view = static_cast<ViewTarget*>(root);
   if (!view->HasParent()) {
     ViewTarget* target = FindTargetInRootView(view, *event);
     if (target) {
       view->ConvertEventToTarget(target, event);
       return target;
     }
   }
-  if (view->view()->shared_properties().count("event-root"))
-    return view;
   return EventTargeter::FindTargetForLocatedEvent(view, event);
 }
 
 bool ViewTargeter::SubtreeCanAcceptEvent(ui::EventTarget* target,
                                          const ui::LocatedEvent& event) const {
   ViewTarget* view = static_cast<ViewTarget*>(target);
 
   if (!view->IsVisible())
     return false;
 
   // TODO(erg): We may need to keep track of the parent on ViewTarget, because
   // we have a check here about
   // WindowDelegate::ShouldDescendIntoChildForEventHandling().
 
+  // TODO(sky): decide if we really want this. If we do, it should be a public
+  // constant and documented.
+  if (view->view()->shared_properties().count("deliver-events-to-parent"))
+    return false;
+
   return true;
 }
 
 bool ViewTargeter::EventLocationInsideBounds(
     ui::EventTarget* target,
     const ui::LocatedEvent& event) const {
   ViewTarget* view = static_cast<ViewTarget*>(target);
   gfx::Point point = event.location();
   const ViewTarget* parent = view->GetParent();
   if (parent)
@@ skipping 26 matching lines @@
       return ViewTarget::TargetFromView(capture_view);
   }
 
   // TODO(erg): There's a whole bunch of junk about handling touch events
   // here. Handle later.
 
   return nullptr;
 }
 
 }  // namespace window_manager