Nukes change_ids from view manager

mojo/services/view_manager/root_node_manager.cc

 // 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.
 
 #include "mojo/services/view_manager/root_node_manager.h"
 
 #include "base/logging.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "mojo/services/view_manager/view.h"
 #include "mojo/services/view_manager/view_manager_service_impl.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 RootNodeManager::ScopedChange::ScopedChange(
     ViewManagerServiceImpl* connection,
     RootNodeManager* root,
-    RootNodeManager::ChangeType change_type,
     bool is_delete_node)
     : root_(root),
       connection_id_(connection->id()),
-      change_type_(change_type),
       is_delete_node_(is_delete_node) {
   root_->PrepareForChange(this);
 }
 
 RootNodeManager::ScopedChange::~ScopedChange() {
   root_->FinishChange();
 }
 
-void RootNodeManager::ScopedChange::SendServerChangeIdAdvanced() {
-  root_->SendServerChangeIdAdvanced();
-}
-
 RootNodeManager::Context::Context() {
   // Pass in false as native viewport creates the PlatformEventSource.
   aura::Env::CreateInstance(false);
 }
 
 RootNodeManager::Context::~Context() {
   aura::Env::DeleteInstance();
 }
 
 RootNodeManager::RootNodeManager(
     ApplicationConnection* app_connection,
     RootViewManagerDelegate* view_manager_delegate,
     const Callback<void()>& native_viewport_closed_callback)
     : app_connection_(app_connection),
       next_connection_id_(1),
-      next_server_change_id_(1),
       root_view_manager_(app_connection,
                          this,
                          view_manager_delegate,
                          native_viewport_closed_callback),
       root_(new Node(this, RootNodeId())),
       current_change_(NULL) {
 }
 
 RootNodeManager::~RootNodeManager() {
   aura::client::FocusClient* focus_client =
@@ skipping 111 matching lines @@
                                         IsChangeSource(i->first));
   }
 }
 
 void RootNodeManager::ProcessNodeHierarchyChanged(const Node* node,
                                                   const Node* new_parent,
                                                   const Node* old_parent) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessNodeHierarchyChanged(
-        node, new_parent, old_parent, next_server_change_id_,
-        IsChangeSource(i->first));
+        node, new_parent, old_parent, IsChangeSource(i->first));
   }
 }
 
 void RootNodeManager::ProcessNodeReorder(const Node* node,
                                          const Node* relative_node,
                                          const OrderDirection direction) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessNodeReorder(
-        node, relative_node, direction, next_server_change_id_,
-        IsChangeSource(i->first));
+        node, relative_node, direction, IsChangeSource(i->first));
   }
 }
 
 void RootNodeManager::ProcessNodeViewReplaced(const Node* node,
                                               const View* new_view,
                                               const View* old_view) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessNodeViewReplaced(node, new_view, old_view,
                                        IsChangeSource(i->first));
   }
 }
 
 void RootNodeManager::ProcessNodeDeleted(const NodeId& node) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
-    i->second->ProcessNodeDeleted(node, next_server_change_id_,
-                                  IsChangeSource(i->first));
+    i->second->ProcessNodeDeleted(node, IsChangeSource(i->first));
   }
 }
 
 void RootNodeManager::ProcessViewDeleted(const ViewId& view) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessViewDeleted(view, IsChangeSource(i->first));
   }
 }
 
@@ skipping 10 matching lines @@
 
 void RootNodeManager::PrepareForChange(ScopedChange* change) {
   // Should only ever have one change in flight.
   CHECK(!current_change_);
   current_change_ = change;
 }
 
 void RootNodeManager::FinishChange() {
   // PrepareForChange/FinishChange should be balanced.
   CHECK(current_change_);
-  if (current_change_->change_type() == CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID)
-    next_server_change_id_++;
   current_change_ = NULL;
 }
 
-void RootNodeManager::SendServerChangeIdAdvanced() {
-  CHECK(current_change_);
-  for (ConnectionMap::iterator i = connection_map_.begin();
-       i != connection_map_.end(); ++i) {
-    if (!DidConnectionMessageClient(i->first))
-      i->second->client()->OnServerChangeIdAdvanced(next_server_change_id_ + 1);
-  }
-}
-
 ViewManagerServiceImpl* RootNodeManager::EmbedImpl(
     const ConnectionSpecificId creator_id,
     const String& url,
     const NodeId& root_id) {
   MessagePipe pipe;
 
   ServiceProvider* service_provider =
       app_connection_->ConnectToApplication(url)->GetServiceProvider();
   service_provider->ConnectToService(
       ViewManagerServiceImpl::Client::Name_,
@@ skipping 40 matching lines @@
 }
 
 void RootNodeManager::OnViewInputEvent(const View* view,
                                        const ui::Event* event) {
   DispatchViewInputEventToWindowManager(view, event);
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo