| Index: chrome/browser/extensions/extension_install_ui.cc
|
| diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
|
| index 1ae8529fa7785fa74a4dec07d6f44e115fefe717..e738a9e220ca1a0b30c52fc661e41009da5cd72c 100644
|
| --- a/chrome/browser/extensions/extension_install_ui.cc
|
| +++ b/chrome/browser/extensions/extension_install_ui.cc
|
| @@ -40,6 +40,7 @@
|
| #include "grit/theme_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| +#include "ui/gfx/image/image.h"
|
|
|
| using content::WebContents;
|
|
|
| @@ -315,7 +316,7 @@ void ExtensionInstallUI::OnInstallFailure(const string16& error) {
|
| error);
|
| }
|
|
|
| -void ExtensionInstallUI::SetIcon(SkBitmap* image) {
|
| +void ExtensionInstallUI::SetIcon(const SkBitmap* image) {
|
| if (image)
|
| icon_ = *image;
|
| else
|
| @@ -324,9 +325,10 @@ void ExtensionInstallUI::SetIcon(SkBitmap* image) {
|
| icon_ = Extension::GetDefaultIcon(extension_->is_app());
|
| }
|
|
|
| -void ExtensionInstallUI::OnImageLoaded(
|
| - SkBitmap* image, const ExtensionResource& resource, int index) {
|
| - SetIcon(image);
|
| +void ExtensionInstallUI::OnImageLoaded(const gfx::Image* image,
|
| + const std::string& extension_id,
|
| + int index) {
|
| + SetIcon(image ? image->ToSkBitmap() : NULL);
|
|
|
| switch (prompt_type_) {
|
| case PERMISSIONS_PROMPT:
|
|
|