Re-land:

views/focus/view_storage.h

 // Copyright (c) 2011 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 VIEWS_FOCUS_VIEW_STORAGE_H_
 #define VIEWS_FOCUS_VIEW_STORAGE_H_
 #pragma once
 
 #include "base/memory/singleton.h"
 #include "views/view.h"
@@ skipping 21 matching lines @@
   // Associates |view| with the specified |storage_id|.
   void StoreView(int storage_id, View* view);
 
   // Returns the view associated with |storage_id| if any, NULL otherwise.
   View* RetrieveView(int storage_id);
 
   // Removes the view associated with |storage_id| if any.
   void RemoveView(int storage_id);
 
   // Notifies the ViewStorage that a view was removed from its parent somewhere.
-  void ViewRemoved(View* parent, View* removed);
+  void ViewRemoved(View* removed);
 
 #ifdef UNIT_TEST
   size_t view_count() const { return view_to_ids_.size(); }
 #endif
 
  private:
   friend struct DefaultSingletonTraits<ViewStorage>;
 
   ViewStorage();
   ~ViewStorage();
@@ skipping 10 matching lines @@
 
   // Association View to id, used to speed up view notification removal.
   std::map<View*, std::vector<int>*> view_to_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewStorage);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_FOCUS_VIEW_STORAGE_H_