Get event targetting working for mouse events.

mojo/services/window_manager/focus_controller.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 "mojo/services/window_manager/focus_controller.h"
 
 #include "base/auto_reset.h"
 #include "mojo/services/public/cpp/view_manager/view_tracker.h"
 #include "mojo/services/window_manager/focus_controller_observer.h"
 #include "mojo/services/window_manager/focus_rules.h"
@@ skipping 100 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FocusController, ui::EventHandler implementation:
 
 void FocusController::OnKeyEvent(ui::KeyEvent* event) {
 }
 
 void FocusController::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED && !event->handled()) {
-    View* view = mojo::WindowManagerApp::GetViewForViewTarget(
-        static_cast<ViewTarget*>(event->target()));
+    View* view = static_cast<ViewTarget*>(event->target())->view();
     ViewFocusedFromInputEvent(view);
   }
 }
 
 void FocusController::OnScrollEvent(ui::ScrollEvent* event) {
 }
 
 void FocusController::OnTouchEvent(ui::TouchEvent* event) {
 }
 
 void FocusController::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_BEGIN &&
       event->details().touch_points() == 1 &&
       !event->handled()) {
-    View* view = mojo::WindowManagerApp::GetViewForViewTarget(
-        static_cast<ViewTarget*>(event->target()));
+    View* view = static_cast<ViewTarget*>(event->target())->view();
     ViewFocusedFromInputEvent(view);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FocusController, aura::WindowObserver implementation:
 
 void FocusController::OnViewVisibilityChanged(View* view) {
   bool visible = view->visible();
   if (!visible)
@@ skipping 145 matching lines @@
 
 void FocusController::ViewFocusedFromInputEvent(View* view) {
   // Only focus |window| if it or any of its parents can be focused. Otherwise
   // FocusWindow() will focus the topmost window, which may not be the
   // currently focused one.
   if (rules_->CanFocusView(GetToplevelView(view)))
     FocusView(view);
 }
 
 }  // namespace mojo