Converting the Cookies options page from a TableView to a TreeView...

views/controls/tree/tree_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/tree/tree_view.h"
 
 #include <vector>
 
+#include "app/gfx/canvas.h"
 #include "app/gfx/canvas_paint.h"
+#include "app/gfx/favicon_size.h"
 #include "app/gfx/icon_util.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/point.h"
 #include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
 #include "grit/app_resources.h"
 #include "views/focus/focus_manager.h"
@@ skipping 626 matching lines @@
     // image index when adding items to the tree. If you change the
     // order you'll undoubtedly need to update itemex.iSelectedImage
     // when the item is added.
     HICON h_closed_icon = IconUtil::CreateHICONFromSkBitmap(*closed_icon);
     HICON h_opened_icon = IconUtil::CreateHICONFromSkBitmap(*opened_icon);
     ImageList_AddIcon(image_list, h_closed_icon);
     ImageList_AddIcon(image_list, h_opened_icon);
     DestroyIcon(h_closed_icon);
     DestroyIcon(h_opened_icon);
     for (size_t i = 0; i < model_images.size(); ++i) {
-      HICON model_icon = IconUtil::CreateHICONFromSkBitmap(model_images[i]);
+      HICON model_icon;
+
+      // Need to resize the provided icons to be the same size as
+      // IDR_FOLDER_CLOSED if they aren't already.
+      if (model_images[i].width() != width ||
+          model_images[i].height() != height) {
+        gfx::Canvas canvas(width, height, false);
+        // Make the background completely transparent.
+        canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
+
+        // Draw our icons into this canvas.
+        int height_offset = (height - model_images[i].height()) / 2;
+        int width_offset = (width - model_images[i].width()) / 2;
+        canvas.DrawBitmapInt(model_images[i], width_offset, height_offset);
+        model_icon = IconUtil::CreateHICONFromSkBitmap(canvas.ExtractBitmap());
+      } else {
+        model_icon = IconUtil::CreateHICONFromSkBitmap(model_images[i]);
+      }
       ImageList_AddIcon(image_list, model_icon);
       DestroyIcon(model_icon);
     }
   }
   return image_list;
 }
 
 HTREEITEM TreeView::GetTreeItemForNodeDuringMutation(TreeModelNode* node) {
   if (node_to_details_map_.find(node) == node_to_details_map_.end()) {
     // User hasn't navigated to this entry yet. Ignore the change.
@@ skipping 79 matching lines @@
       }
       // Fall through and let the default handler process as well.
       break;
   }
   WNDPROC handler = tree->original_handler_;
   DCHECK(handler);
   return CallWindowProc(handler, window, message, w_param, l_param);
 }
 
 }  // namespace views