Revert 266940 "First step at synchronizing client model changes ..."

trunk/src/mojo/services/view_manager/view_manager_connection.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_VIEW_MANAGER_CONNECTION_H_
 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "mojo/public/cpp/shell/service.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/view_manager/ids.h"
 #include "mojo/services/view_manager/node_delegate.h"
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace mojo {
 namespace services {
 namespace view_manager {
 
 class Node;
 class RootNodeManager;
 class View;
 
 // Manages a connection from the client.
 class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
-    : public ServiceConnection<IViewManager, ViewManagerConnection,
+    : public ServiceConnection<ViewManager, ViewManagerConnection,
                                RootNodeManager>,
       public NodeDelegate {
  public:
   ViewManagerConnection();
   virtual ~ViewManagerConnection();
 
   uint16_t id() const { return id_; }
 
   // Invoked from Service when connection is established.
   void Initialize(
@@ skipping 30 matching lines @@
   // is the connection that originated the change.
   bool DeleteViewImpl(ViewManagerConnection* source,
                       const ViewId& view_id,
                       ChangeId change_id);
 
   // Sets the view associated with a node.
   bool SetViewImpl(const NodeId& node_id,
                    const ViewId& view_id,
                    ChangeId change_id);
 
-  // Overridden from IViewManager:
+  // Overridden from ViewManager:
   virtual void CreateNode(uint16_t node_id,
                           const Callback<void(bool)>& callback) OVERRIDE;
   virtual void DeleteNode(uint32_t transport_node_id,
                           ChangeId change_id,
                           const mojo::Callback<void(bool)>& callback) OVERRIDE;
   virtual void AddNode(uint32_t parent_id,
                        uint32_t child_id,
                        ChangeId change_id,
                        const Callback<void(bool)>& callback) OVERRIDE;
   virtual void RemoveNodeFromParent(
       uint32_t node_id,
       ChangeId change_id,
       const Callback<void(bool)>& callback) OVERRIDE;
   virtual void CreateView(uint16_t view_id,
                           const mojo::Callback<void(bool)>& callback) OVERRIDE;
   virtual void DeleteView(uint32_t transport_view_id,
                           ChangeId change_id,
                           const mojo::Callback<void(bool)>& callback) OVERRIDE;
   virtual void SetView(uint32_t transport_node_id,
                        uint32_t transport_view_id,
                        ChangeId change_id,
                        const mojo::Callback<void(bool)>& callback) OVERRIDE;
 
-  // Overridden from NodeDelegate:
+  // Overriden from NodeDelegate:
   virtual void OnNodeHierarchyChanged(const NodeId& node,
                                       const NodeId& new_parent,
                                       const NodeId& old_parent) OVERRIDE;
   virtual void OnNodeViewReplaced(const NodeId& node,
                                   const ViewId& new_view_id,
                                   const ViewId& old_view_id) OVERRIDE;
 
   // Id of this connection as assigned by RootNodeManager. Assigned in
   // Initialize().
   uint16_t id_;
 
   NodeMap node_map_;
 
   ViewMap view_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection);
 };
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_