| Index: chrome/browser/ui/views/browser_actions_container.cc
|
| diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
|
| index ef3dd6e7008693358b448560840b4d8e19296beb..b86dc148d90d65a746e7a19a52c719c7a8c5342d 100644
|
| --- a/chrome/browser/ui/views/browser_actions_container.cc
|
| +++ b/chrome/browser/ui/views/browser_actions_container.cc
|
| @@ -136,11 +136,11 @@ void BrowserActionButton::ButtonPressed(views::Button* sender,
|
| panel_->OnBrowserActionExecuted(this, false);
|
| }
|
|
|
| -void BrowserActionButton::OnImageLoaded(SkBitmap* image,
|
| - const ExtensionResource& resource,
|
| +void BrowserActionButton::OnImageLoaded(const gfx::Image& image,
|
| + const std::string& extension_id,
|
| int index) {
|
| - if (image)
|
| - default_icon_ = *image;
|
| + if (!image.IsEmpty())
|
| + default_icon_ = *image.ToSkBitmap();
|
|
|
| // Call back to UpdateState() because a more specific icon might have been set
|
| // while the load was outstanding.
|
|
|