Nukes change_ids from view 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>
 
@@ skipping 20 matching lines @@
 class RootViewManagerDelegate;
 class View;
 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 {
  public:
-  // Used to indicate if the server id should be incremented after notifiying
-  // clients of the change.
-  enum ChangeType {
-    CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID,
-    CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID,
-  };
-
   // 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,
-                 RootNodeManager::ChangeType change_type,
                  bool is_delete_node);
     ~ScopedChange();
 
     ConnectionSpecificId connection_id() const { return connection_id_; }
-    ChangeType change_type() const { return change_type_; }
     bool is_delete_node() const { return is_delete_node_; }
 
     // Marks the connection with the specified id as having seen a message.
     void MarkConnectionAsMessaged(ConnectionSpecificId connection_id) {
       message_ids_.insert(connection_id);
     }
 
     // Returns true if MarkConnectionAsMessaged(connection_id) was invoked.
     bool DidMessageConnection(ConnectionSpecificId connection_id) const {
       return message_ids_.count(connection_id) > 0;
     }
 
-    // Sends OnServerChangeIdAdvanced() to all connections that have not yet
-    // been messaged.
-    void SendServerChangeIdAdvanced();
-
    private:
     RootNodeManager* root_;
     const ConnectionSpecificId connection_id_;
-    const ChangeType change_type_;
     const bool is_delete_node_;
 
     // See description of MarkConnectionAsMessaged/DidMessageConnection.
     std::set<ConnectionSpecificId> message_ids_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedChange);
   };
 
   RootNodeManager(ApplicationConnection* app_connection,
                   RootViewManagerDelegate* view_manager_delegate,
                   const Callback<void()>& native_viewport_closed_callback);
   virtual ~RootNodeManager();
 
   // Returns the id for the next ViewManagerServiceImpl.
   ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
-  Id next_server_change_id() const {
-    return next_server_change_id_;
-  }
-
   void AddConnection(ViewManagerServiceImpl* connection);
   void RemoveConnection(ViewManagerServiceImpl* connection);
 
   // Establishes the initial client. Similar to Connect(), but the resulting
   // client is allowed to do anything.
   void EmbedRoot(const std::string& url);
 
   // See description of ViewManagerService::Embed() for details. This assumes
   // |transport_node_id| is valid.
   void Embed(ConnectionSpecificId creator_id,
@@ skipping 68 matching lines @@
   // 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();
 
-  // See description in ScopedChange.
-  void SendServerChangeIdAdvanced();
-
   // Returns true if the specified connection originated the current change.
   bool IsChangeSource(ConnectionSpecificId connection_id) const {
     return current_change_ && current_change_->connection_id() == connection_id;
   }
 
   // Implementation of the two embed variants.
   ViewManagerServiceImpl* EmbedImpl(ConnectionSpecificId creator_id,
                                     const String& url,
                                     const NodeId& root_id);
 
@@ skipping 11 matching lines @@
   virtual void OnViewInputEvent(const View* view,
                                 const ui::Event* event) OVERRIDE;
 
   Context context_;
 
   ApplicationConnection* app_connection_;
 
   // ID to use for next ViewManagerServiceImpl.
   ConnectionSpecificId next_connection_id_;
 
-  Id next_server_change_id_;
-
   // Set of ViewManagerServiceImpls.
   ConnectionMap connection_map_;
 
   RootViewManager root_view_manager_;
 
   // Root node.
   scoped_ptr<Node> root_;
 
   // Set of ViewManagerServiceImpls created by way of Connect(). These have to
   // be explicitly destroyed.
   std::set<ViewManagerServiceImpl*> connections_created_by_connect_;
 
   // If non-null we're processing a change. The ScopedChange is not owned by us
   // (it's created on the stack by ViewManagerServiceImpl).
   ScopedChange* current_change_;
 
   DISALLOW_COPY_AND_ASSIGN(RootNodeManager);
 };
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_