View synchronization

mojo/services/view_manager/node.h

Index: mojo/services/view_manager/node.h
diff --git a/mojo/services/view_manager/node.h b/mojo/services/view_manager/node.h
index d1b65ae24fa2b175296bdc3f266567cc878e7920..7a9b13054b8e4db0da5d8a4a0a8ad236707ab6eb 100644
--- a/mojo/services/view_manager/node.h
+++ b/mojo/services/view_manager/node.h
@@ -19,7 +19,9 @@ namespace services {
 namespace view_manager {
 
 class NodeDelegate;
+namespace service {
 class View;
+}
 
 // Represents a node in the graph. Delegate is informed of interesting events.
 class MOJO_VIEW_MANAGER_EXPORT Node
@@ -44,8 +46,8 @@ class MOJO_VIEW_MANAGER_EXPORT Node
   std::vector<Node*> GetChildren();
 
   // Sets the view associated with this node. Node does not own its View.
-  void SetView(View* view);
-  View* view() { return view_; }
+  void SetView(service::View* view);
+  service::View* view() { return view_; }
 
  private:
   // WindowObserver overrides:
@@ -76,7 +78,7 @@ class MOJO_VIEW_MANAGER_EXPORT Node
   const NodeId id_;
 
   // Weak pointer to view associated with this node.
-  View* view_;
+  service::View* view_;
 
   ViewId view_id_;