Change panels to use gfx::Image instead of SkBitmap for favicon.

chrome/browser/ui/panels/panel_window_controller_cocoa.mm

 // Copyright (c) 2012 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 "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
 #import "chrome/browser/ui/panels/panel_utils_cocoa.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "content/public/browser/render_widget_host_view.h"
 #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"
 
 using content::WebContents;
 
 const int kMinimumWindowSize = 1;
 const double kBoundsAnimationSpeedPixelsPerSecond = 1000;
 const double kBoundsAnimationMaxDurationSeconds = 0.18;
 
@@ skipping 503 matching lines @@
   if (throbberShouldSpin_) {
     // If the throbber is spinning now, no need to replace it.
     if ([[titlebar_view_ icon] isKindOfClass:[ThrobberView class]])
       return;
 
     NSImage* iconImage =
         ResourceBundle::GetSharedInstance().GetNativeImageNamed(IDR_THROBBER);
     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];
     icon = iconView;
   }
 
   [titlebar_view_ setIcon:icon];
 }
 
 - (void)updateThrobber:(BOOL)shouldSpin {
@@ skipping 449 matching lines @@
 - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
   NSRect contentRect = [[[self window] contentView] convertRect:frameRect
                                                        fromView:nil];
   contentRect.size.height -= panel::kTitlebarHeight;
   if (contentRect.size.height < 0)
     contentRect.size.height = 0;
   return contentRect;
 }
 
 @end