Rename Node to View in the View Manager mojom & client lib. Service TBD.

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"
 #include "mojo/aura/window_tree_host_mojo_delegate.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/cpp/bindings/string.h"
-#include "mojo/services/public/cpp/view_manager/node_observer.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
+#include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "mojo/services/window_manager/window_manager_service_impl.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
 namespace client {
 class ActivationClient;
 class FocusClient;
 }
 class Window;
 }
 
 namespace wm {
 class ScopedCaptureClient;
 }
 
 namespace mojo {
 
 class AuraInit;
 class WindowManagerServiceImpl;
 class WindowTreeHostMojo;
 
 class WindowManagerApp
     : public ApplicationDelegate,
       public ViewManagerDelegate,
-      public NodeObserver,
+      public ViewObserver,
       public WindowTreeHostMojoDelegate,
       public aura::client::FocusChangeObserver,
       public aura::client::ActivationChangeObserver {
  public:
   explicit WindowManagerApp(ViewManagerDelegate* delegate);
   virtual ~WindowManagerApp();
 
   void AddConnection(WindowManagerServiceImpl* connection);
   void RemoveConnection(WindowManagerServiceImpl* connection);
 
   Id OpenWindow();
   Id OpenWindowWithURL(const String& url);
-  void SetCapture(Id node);
-  void FocusWindow(Id node);
-  void ActivateWindow(Id node);
+  void SetCapture(Id view);
+  void FocusWindow(Id view);
+  void ActivateWindow(Id view);
 
   bool IsReady() const;
 
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* impl) MOJO_OVERRIDE;
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE;
 
  private:
   typedef std::set<WindowManagerServiceImpl*> Connections;
-  typedef std::map<Id, aura::Window*> NodeIdToWindowMap;
+  typedef std::map<Id, aura::Window*> ViewIdToWindowMap;
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(
       ViewManager* view_manager,
-      Node* root,
+      View* root,
       ServiceProviderImpl* exported_services,
       scoped_ptr<ServiceProvider> imported_services) MOJO_OVERRIDE;
   virtual void OnViewManagerDisconnected(
       ViewManager* view_manager) MOJO_OVERRIDE;
 
-  // Overridden from NodeObserver:
+  // Overridden from ViewObserver:
   virtual void OnTreeChanged(
-      const NodeObserver::TreeChangeParams& params) MOJO_OVERRIDE;
-  virtual void OnNodeDestroyed(Node* node) MOJO_OVERRIDE;
+      const ViewObserver::TreeChangeParams& params) MOJO_OVERRIDE;
+  virtual void OnViewDestroyed(View* view) MOJO_OVERRIDE;
 
   // Overridden from WindowTreeHostMojoDelegate:
   virtual void CompositorContentsChanged(const SkBitmap& bitmap) MOJO_OVERRIDE;
 
   // Overridden from aura::client::FocusChangeObserver:
   virtual void OnWindowFocused(aura::Window* gained_focus,
                                aura::Window* lost_focus) MOJO_OVERRIDE;
 
   // Overridden from aura::client::ActivationChangeObserver:
   virtual void OnWindowActivated(aura::Window* gained_active,
                                  aura::Window* lost_active) MOJO_OVERRIDE;
 
-  aura::Window* GetWindowForNodeId(Id node) const;
+  aura::Window* GetWindowForViewId(Id view) const;
 
-  // Creates an aura::Window for every node in the hierarchy beneath |id|,
+  // Creates an aura::Window for every view in the hierarchy beneath |id|,
   // and adds to the registry so that it can be retrieved later via
-  // GetWindowForNodeId().
-  // TODO(beng): perhaps Node should have a property bag.
+  // GetWindowForViewId().
+  // TODO(beng): perhaps View should have a property bag.
   void RegisterSubtree(Id id, aura::Window* parent);
   // Deletes the aura::Windows associated with the hierarchy beneath |id|,
   // and removes from the registry.
   void UnregisterSubtree(Id id);
 
   InterfaceFactoryImplWithContext<WindowManagerServiceImpl, WindowManagerApp>
       window_manager_service_factory_;
 
   ViewManagerDelegate* wrapped_delegate_;
 
   ViewManager* view_manager_;
   ViewManagerClientFactory view_manager_client_factory_;
-  Node* root_;
+  View* root_;
 
   scoped_ptr<AuraInit> aura_init_;
   scoped_ptr<WindowTreeHostMojo> window_tree_host_;
 
   scoped_ptr<wm::ScopedCaptureClient> capture_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
   aura::client::ActivationClient* activation_client_;
 
   Connections connections_;
-  NodeIdToWindowMap node_id_to_window_map_;
+  ViewIdToWindowMap view_id_to_window_map_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_