| Index: chrome/browser/ui/gtk/gtk_tree.cc
|
| diff --git a/chrome/browser/ui/gtk/gtk_tree.cc b/chrome/browser/ui/gtk/gtk_tree.cc
|
| index 6c9d6dc581fa97fac0aa46f0bad8fa38115f77f8..5f1fa24a2283f3d3e299f5a26ffad4418d4d5b75 100644
|
| --- a/chrome/browser/ui/gtk/gtk_tree.cc
|
| +++ b/chrome/browser/ui/gtk/gtk_tree.cc
|
| @@ -11,6 +11,7 @@
|
| #include "ui/base/models/table_model.h"
|
| #include "ui/gfx/gtk_util.h"
|
| #include "ui/gfx/image/image.h"
|
| +#include "ui/gfx/image/image_skia.h"
|
|
|
| namespace gtk_tree {
|
|
|
| @@ -351,10 +352,10 @@ TreeAdapter::TreeAdapter(Delegate* delegate, ui::TreeModel* tree_model)
|
| G_TYPE_POINTER);
|
| tree_model->AddObserver(this);
|
|
|
| - std::vector<SkBitmap> icons;
|
| + std::vector<gfx::ImageSkia> icons;
|
| tree_model->GetIcons(&icons);
|
| for (size_t i = 0; i < icons.size(); ++i) {
|
| - pixbufs_.push_back(gfx::GdkPixbufFromSkBitmap(icons[i]));
|
| + pixbufs_.push_back(gfx::GdkPixbufFromSkBitmap(*icons[i].bitmap()));
|
| }
|
| }
|
|
|
|
|