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

views/controls/table/table_view.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/controls/table/table_view.h"
 
 #include <commctrl.h>
 #include <windowsx.h>
 
 #include <algorithm>
@@ skipping 1056 matching lines @@
 
     case LVN_MARQUEEBEGIN:  // We don't want the marque selection.
       return 1;
 
     default:
       break;
   }
   return 0;
 }
 
-void TableView::OnDestroy() {
-  if (table_type_ == ICON_AND_TEXT) {
-    HIMAGELIST image_list =
-        ListView_GetImageList(GetNativeControlHWND(), LVSIL_SMALL);
-    DCHECK(image_list);
-    if (image_list)
-      ImageList_Destroy(image_list);
-  }
-}
-
 // Returns result, unless ascending is false in which case -result is returned.
 static int SwapCompareResult(int result, bool ascending) {
   return ascending ? result : -result;
 }
 
 int TableView::CompareRows(int model_row1, int model_row2) {
   if (model_->HasGroups()) {
     // By default ListView sorts the elements regardless of groups. In such
     // a situation the groups display only the items they contain. This results
     // in the visual order differing from the item indices. I could not find
@@ skipping 441 matching lines @@
 }
 
 void TableSelectionIterator::UpdateModelIndexFromViewIndex() {
   if (view_index_ == -1)
     model_index_ = -1;
   else
     model_index_ = table_view_->view_to_model(view_index_);
 }
 
 }  // namespace views