| Index: chrome/browser/ui/panels/panel_window_controller_cocoa.mm
|
| diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
|
| index 8c77b8f680316a373a21b37218aebadfec4d3775..b97b971bb7f94d895ad83913431afbe7135441fd 100644
|
| --- a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
|
| +++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
|
| @@ -38,7 +38,6 @@
|
| #include "content/public/browser/web_contents.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
|
| #include "grit/ui_resources.h"
|
| -#include "skia/ext/skia_utils_mac.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/image/image.h"
|
| #include "webkit/glue/webcursor.h"
|
| @@ -562,12 +561,10 @@ NSCursor* LoadWebKitCursor(WebKit::WebCursorInfo::Type type) {
|
| icon = [ThrobberView filmstripThrobberViewWithFrame:iconFrame
|
| image:iconImage];
|
| } else {
|
| - SkBitmap bitmap = windowShim_->panel()->GetCurrentPageIcon();
|
| + gfx::Image page_icon = windowShim_->panel()->GetCurrentPageIcon();
|
| ResourceBundle& rb = ResourceBundle::GetSharedInstance();
|
| - NSImage* iconImage = bitmap.isNull() ?
|
| - rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) :
|
| - gfx::SkBitmapToNSImageWithColorSpace(bitmap,
|
| - base::mac::GetSystemColorSpace());
|
| + NSImage* iconImage = page_icon.IsEmpty() ?
|
| + rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) : page_icon.ToNSImage();
|
| NSImageView* iconView =
|
| [[[NSImageView alloc] initWithFrame:iconFrame] autorelease];
|
| [iconView setImage:iconImage];
|
|
|