Merge 33055 - Avoid double freeing image list in TableView....

views/controls/table/table_view.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
 #define VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 258 matching lines @@
   virtual bool ImplementPostPaint() { return false; }
   // Subclasses can implement in this method extra-painting for cells.
   virtual void PostPaint(int model_row, int column, bool selected,
                          const gfx::Rect& bounds, HDC device_context) { }
   virtual void PostPaint() {}
 
   virtual HWND CreateNativeControl(HWND parent_container);
 
   virtual LRESULT OnNotify(int w_param, LPNMHDR l_param);
 
-  // Overriden to destroy the image list.
-  virtual void OnDestroy();
-
   // Used to sort the two rows. Returns a value < 0, == 0 or > 0 indicating
   // whether the row2 comes before row1, row2 is the same as row1 or row1 comes
   // after row2. This invokes CompareValues on the model with the sorted column.
   virtual int CompareRows(int model_row1, int model_row2);
 
   // Called before sorting. This does nothing and is intended for subclasses
   // that need to cache state used during sorting.
   virtual void PrepareForSort() {}
 
   // Returns the width of the specified column by id, or -1 if the column isn't
@@ skipping 174 matching lines @@
   scoped_array<int> view_to_model_;
   scoped_array<int> model_to_view_;
 
   DISALLOW_COPY_AND_ASSIGN(TableView);
 };
 #endif  // defined(OS_WIN)
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_