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

chrome/browser/ui/panels/panel_titlebar_gtk.cc

 // 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_titlebar_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_gtk.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_utils_gtk.h"
 
 namespace {
 
 // Padding around the titlebar.
 const int kPanelTitlebarPaddingTop = 7;
 const int kPanelTitlebarPaddingBottom = 7;
 const int kPanelTitlebarPaddingLeft = 4;
 const int kPanelTitlebarPaddingRight = 8;
 
@@ skipping 179 matching lines @@
 
 void PanelTitlebarGtk::UpdateThrobber(
     content::WebContents* web_contents) {
   if (web_contents && web_contents->IsLoading()) {
     GdkPixbuf* icon_pixbuf =
         throbber_.GetNextFrame(web_contents->IsWaitingForResponse());
     gtk_image_set_from_pixbuf(GTK_IMAGE(icon_), icon_pixbuf);
   } else {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
-    SkBitmap icon = panel_gtk_->panel()->GetCurrentPageIcon();
-    if (icon.empty()) {
+    gfx::Image icon = panel_gtk_->panel()->GetCurrentPageIcon();
+    if (icon.IsEmpty()) {
       // Fallback to the Chromium icon if the page has no icon.
       gtk_image_set_from_pixbuf(GTK_IMAGE(icon_),
           rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToGdkPixbuf());
     } else {
-      GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(icon);
-      gtk_image_set_from_pixbuf(GTK_IMAGE(icon_), icon_pixbuf);
-      g_object_unref(icon_pixbuf);
+      gtk_image_set_from_pixbuf(GTK_IMAGE(icon_), icon.ToGdkPixbuf());
     }
 
     throbber_.Reset();
   }
 }
 
 void PanelTitlebarGtk::UpdateTextColor() {
   GdkColor text_color = gfx::SkColorToGdkColor(GetTextColor());
   gtk_util::SetLabelColor(title_, &text_color);
 }
@@ skipping 64 matching lines @@
   event->crossing.state = 0;
 
   g_signal_emit_by_name(GTK_OBJECT(close_button()->widget()),
                         "enter-notify-event", event,
                         &return_value);
 }
 
 GtkWidget* PanelTitlebarGtk::widget() const {
   return container_;
 }