Re-land:

views/focus/view_storage.cc

 // Copyright (c) 2006-2008 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 "views/focus/view_storage.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 44 matching lines @@
   std::map<int, View*>::iterator iter = id_to_view_.find(storage_id);
   if (iter == id_to_view_.end())
     return NULL;
   return iter->second;
 }
 
 void ViewStorage::RemoveView(int storage_id) {
   EraseView(storage_id, false);
 }
 
-void ViewStorage::ViewRemoved(View* parent, View* removed) {
+void ViewStorage::ViewRemoved(View* removed) {
   // Let's first retrieve the ids for that view.
   std::map<View*, std::vector<int>*>::iterator ids_iter =
       view_to_ids_.find(removed);
 
   if (ids_iter == view_to_ids_.end()) {
     // That view is not in the view storage.
     return;
   }
 
   std::vector<int>* ids = ids_iter->second;
@@ skipping 30 matching lines @@
     ids->erase(id_iter);
   }
 
   if (ids->empty()) {
     delete ids;
     view_to_ids_.erase(ids_iter);
   }
 }
 
 }  // namespace views