Move focus from the view manager to the window manager.

mojo/services/view_manager/root_node_manager.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_VIEW_MANAGER_ROOT_NODE_MANAGER_H_
 #define MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/services/view_manager/ids.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/node_delegate.h"
 #include "mojo/services/view_manager/root_view_manager.h"
 #include "mojo/services/view_manager/view_manager_export.h"
-#include "ui/aura/client/focus_change_observer.h"
 
 namespace ui {
 class Event;
 }
 
 namespace mojo {
 
 class ApplicationConnection;
 
 namespace service {
 
 class RootViewManagerDelegate;
 class ViewManagerServiceImpl;
 
 // RootNodeManager is responsible for managing the set of
 // ViewManagerServiceImpls as well as providing the root of the node hierarchy.
-class MOJO_VIEW_MANAGER_EXPORT RootNodeManager
-    : public NodeDelegate,
-      public aura::client::FocusChangeObserver {
+class MOJO_VIEW_MANAGER_EXPORT RootNodeManager : public NodeDelegate {
  public:
   // Create when a ViewManagerServiceImpl is about to make a change. Ensures
   // clients are notified of the correct change id.
   class ScopedChange {
    public:
     ScopedChange(ViewManagerServiceImpl* connection,
                  RootNodeManager* root,
                  bool is_delete_node);
     ~ScopedChange();
 
@@ skipping 68 matching lines @@
       ConnectionSpecificId creator_id,
       const std::string& url) const;
 
   // Returns the ViewManagerServiceImpl that has |id| as a root.
   ViewManagerServiceImpl* GetConnectionWithRoot(const NodeId& id) {
     return const_cast<ViewManagerServiceImpl*>(
         const_cast<const RootNodeManager*>(this)->GetConnectionWithRoot(id));
   }
   const ViewManagerServiceImpl* GetConnectionWithRoot(const NodeId& id) const;
 
-  void DispatchNodeInputEventToWindowManager(const Node* node,
-                                             const ui::Event* event);
+  void DispatchNodeInputEventToWindowManager(EventPtr event);
 
   // These functions trivially delegate to all ViewManagerServiceImpls, which in
   // term notify their clients.
   void ProcessNodeDestroyed(Node* node);
   void ProcessNodeBoundsChanged(const Node* node,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds);
   void ProcessNodeHierarchyChanged(const Node* node,
                                    const Node* new_parent,
                                    const Node* old_parent);
   void ProcessNodeReorder(const Node* node,
                           const Node* relative_node,
                           const OrderDirection direction);
   void ProcessNodeDeleted(const NodeId& node);
 
  private:
   // Used to setup any static state needed by RootNodeManager.
   struct Context {
     Context();
     ~Context();
   };
 
   typedef std::map<ConnectionSpecificId, ViewManagerServiceImpl*> ConnectionMap;
 
-  // Overridden from aura::client::FocusChangeObserver:
-  virtual void OnWindowFocused(aura::Window* gained_focus,
-                               aura::Window* lost_focus) OVERRIDE;
-
   // Invoked when a connection is about to make a change.  Subsequently followed
   // by FinishChange() once the change is done.
   //
   // Changes should never nest, meaning each PrepareForChange() must be
   // balanced with a call to FinishChange() with no PrepareForChange()
   // in between.
   void PrepareForChange(ScopedChange* change);
 
   // Balances a call to PrepareForChange().
   void FinishChange();
@@ skipping 11 matching lines @@
       InterfaceRequest<ServiceProvider> service_provider);
 
   // Overridden from NodeDelegate:
   virtual void OnNodeDestroyed(const Node* node) OVERRIDE;
   virtual void OnNodeHierarchyChanged(const Node* node,
                                       const Node* new_parent,
                                       const Node* old_parent) OVERRIDE;
   virtual void OnNodeBoundsChanged(const Node* node,
                                    const gfx::Rect& old_bounds,
                                    const gfx::Rect& new_bounds) OVERRIDE;
-  virtual void OnNodeInputEvent(const Node* node,
-                                const ui::Event* event) OVERRIDE;
 
   Context context_;
 
   ApplicationConnection* app_connection_;
 
   // ID to use for next ViewManagerServiceImpl.
   ConnectionSpecificId next_connection_id_;
 
   // Set of ViewManagerServiceImpls.
   ConnectionMap connection_map_;
@@ skipping 11 matching lines @@
   // (it's created on the stack by ViewManagerServiceImpl).
   ScopedChange* current_change_;
 
   DISALLOW_COPY_AND_ASSIGN(RootNodeManager);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_