Remove the removed display from the active list after displays are added

ash/display/display_manager.cc

 // Copyright (c) 2012 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 "ash/display/display_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 #include <string>
@@ skipping 776 matching lines @@
         display_changes[updated_index] = metrics;
       }
     }
   }
 
   active_display_list_ = new_displays;
 
   RefreshFontParams();
   base::AutoReset<bool> resetter(&change_display_upon_host_resize_, false);
 
+  int active_display_list_size = active_display_list_.size();
   // Temporarily add displays to be removed because display object
   // being removed are accessed during shutting down the root.
   active_display_list_.insert(active_display_list_.end(),
                               removed_displays.begin(), removed_displays.end());
 
-  for (DisplayList::const_reverse_iterator iter = removed_displays.rbegin();
-       iter != removed_displays.rend(); ++iter) {
-    screen_->NotifyDisplayRemoved(active_display_list_.back());
-    active_display_list_.pop_back();
-  }
+  for (const auto& display : removed_displays)
+    screen_->NotifyDisplayRemoved(display);
 
-  for (std::vector<size_t>::iterator iter = added_display_indices.begin();
-       iter != added_display_indices.end(); ++iter) {
-    screen_->NotifyDisplayAdded(active_display_list_[*iter]);
-  }
+  for (size_t index : added_display_indices)
+    screen_->NotifyDisplayAdded(active_display_list_[index]);
+
+  active_display_list_.resize(active_display_list_size);
 
   bool notify_primary_change =
       delegate_ ? old_primary.id() != screen_->GetPrimaryDisplay().id() : false;
 
   for (std::map<size_t, uint32_t>::iterator iter = display_changes.begin();
        iter != display_changes.end();
        ++iter) {
     uint32_t metrics = iter->second;
     const gfx::Display& updated_display = active_display_list_[iter->first];
 
@@ skipping 492 matching lines @@
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 void DisplayManager::RunPendingTasksForTest() {
   if (!software_mirroring_display_list_.empty())
     base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace ash