Get event targetting working for mouse events.

mojo/services/window_manager/window_manager_app.h

 // 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.
 
 #ifndef MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 37 matching lines @@
                          public ViewManagerDelegate,
                          public ViewObserver,
                          public ui::EventHandler,
                          public FocusControllerObserver,
                          public InterfaceFactory<WindowManagerInternal> {
  public:
   WindowManagerApp(ViewManagerDelegate* view_manager_delegate,
                    WindowManagerDelegate* window_manager_delegate);
   ~WindowManagerApp() override;
 
-  static View* GetViewForViewTarget(ViewTarget* view);
-  ViewTarget* GetViewTargetForViewId(Id view);
-
   mojo::ViewEventDispatcher* event_dispatcher() {
     return view_event_dispatcher_.get();
   }
 
   // Register/deregister new connections to the window manager service.
   void AddConnection(WindowManagerImpl* connection);
   void RemoveConnection(WindowManagerImpl* connection);
 
   // These are canonical implementations of the window manager API methods.
   void SetCapture(Id view);
@@ skipping 15 matching lines @@
   void Embed(const String& url,
              InterfaceRequest<ServiceProvider> service_provider);
 
   // Overridden from ApplicationDelegate:
   void Initialize(ApplicationImpl* impl) override;
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override;
 
  private:
   // TODO(sky): rename this. Connections is ambiguous.
   typedef std::set<WindowManagerImpl*> Connections;
-  typedef std::map<Id, ViewTarget*> ViewIdToViewTargetMap;
+  typedef std::set<Id> RegisteredViewIdSet;
 
   struct PendingEmbed;
   class WindowManagerInternalImpl;
 
   // Creates an ViewTarget for every view in the hierarchy beneath |view|,
   // and adds to the registry so that it can be retrieved later via
   // GetViewTargetForViewId().
   // TODO(beng): perhaps View should have a property bag.
-  void RegisterSubtree(View* view, ViewTarget* parent);
+  void RegisterSubtree(View* view);
 
   // Recursively invokes Unregister() for |view| and all its descendants.
   void UnregisterSubtree(View* view);
 
   // Deletes the ViewTarget associated with the hierarchy beneath |id|,
   // and removes from the registry.
   void Unregister(View* view);
 
   // Overridden from ViewManagerDelegate:
   void OnEmbed(ViewManager* view_manager,
                View* root,
                ServiceProviderImpl* exported_services,
                scoped_ptr<ServiceProvider> imported_services) override;
   void OnViewManagerDisconnected(ViewManager* view_manager) override;
 
   // Overridden from ViewObserver:
   void OnTreeChanged(const ViewObserver::TreeChangeParams& params) override;
   void OnViewDestroying(View* view) override;
-  void OnViewBoundsChanged(View* view,
-                           const Rect& old_bounds,
-                           const Rect& new_bounds) override;
 
   // Overridden from ui::EventHandler:
   void OnEvent(ui::Event* event) override;
 
   // Overridden from mojo::FocusControllerObserver:
   void OnViewFocused(View* gained_focus, View* lost_focus) override;
   void OnViewActivated(View* gained_active, View* lost_active) override;
 
   // Creates the connection to the ViewManager.
   void LaunchViewManager(ApplicationImpl* app);
@@ skipping 14 matching lines @@
   ViewManagerDelegate* wrapped_view_manager_delegate_;
   WindowManagerDelegate* window_manager_delegate_;
 
   ViewManager* view_manager_;
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
   View* root_;
 
   scoped_ptr<mojo::FocusController> focus_controller_;
 
   Connections connections_;
-  ViewIdToViewTargetMap view_id_to_view_target_map_;
+  RegisteredViewIdSet registered_view_id_set_;
 
   WindowManagerInternalClientPtr window_manager_client_;
 
   ScopedVector<PendingEmbed> pending_embeds_;
 
   scoped_ptr<ViewManagerClient> view_manager_client_;
 
   scoped_ptr<ViewEventDispatcher> view_event_dispatcher_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_