Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/gtk/browser_titlebar.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/gtk/browser_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 36 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/x/active_window_watcher_x.h"
-#include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 
 using content::WebContents;
 
 namespace {
 
 // The space above the titlebars.
 const int kTitlebarHeight = 14;
 
 // The thickness in pixels of the tab border.
@@ skipping 526 matching lines @@
   string16 title = browser_window_->browser()->GetWindowTitleForCurrentTab();
   gtk_label_set_text(GTK_LABEL(app_mode_title_), UTF16ToUTF8(title).c_str());
 
   if (browser_window_->browser()->is_app()) {
     switch (browser_window_->browser()->type()) {
       case Browser::TYPE_POPUP: {
         // Update the system app icon.  We don't need to update the icon in the
         // top left of the custom frame, that will get updated when the
         // throbber is updated.
         Profile* profile = browser_window_->browser()->profile();
-        SkBitmap icon = browser_window_->browser()->GetCurrentPageIcon();
-        if (icon.empty()) {
+        gfx::Image icon = browser_window_->browser()->GetCurrentPageIcon();
+        if (icon.IsEmpty()) {
           gtk_util::SetWindowIcon(window_, profile);
         } else {
-          GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(icon);
+          GdkPixbuf* icon_pixbuf = icon.ToGdkPixbuf();

[Nico, 2012/08/16 21:35:06]

nit: no need for the local variable

           gtk_util::SetWindowIcon(window_, profile, icon_pixbuf);
-          g_object_unref(icon_pixbuf);
         }
         break;
       }
       case Browser::TYPE_TABBED: {
         NOTREACHED() << "We should never have a tabbed app window.";
         break;
       }
       case Browser::TYPE_PANEL: {
         NOTREACHED();
         break;
       }
     }
   }
 }
 
 void BrowserTitlebar::UpdateThrobber(WebContents* web_contents) {
   DCHECK(app_mode_favicon_);
 
   if (web_contents && web_contents->IsLoading()) {
     GdkPixbuf* icon_pixbuf =
         throbber_.GetNextFrame(web_contents->IsWaitingForResponse());
     gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);
   } else {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     // Note: we want to exclude the application popup/panel window.
     if ((browser_window_->browser()->is_app() &&
         !browser_window_->browser()->is_type_tabbed())) {
-      SkBitmap icon = browser_window_->browser()->GetCurrentPageIcon();
-      if (icon.empty()) {
+      gfx::Image icon = browser_window_->browser()->GetCurrentPageIcon();
+      if (icon.IsEmpty()) {
         // Fallback to the Chromium icon if the page has no icon.
         gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_),
             rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToGdkPixbuf());
       } else {
-        GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(icon);
+        GdkPixbuf* icon_pixbuf = icon.ToGdkPixbuf();
         gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);

[Nico, 2012/08/16 21:35:06]

likewise

-        g_object_unref(icon_pixbuf);
       }
     } else {
       gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_),
           rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToGdkPixbuf());
     }
     throbber_.Reset();
   }
 }
 
 void BrowserTitlebar::UpdateTitlebarAlignment() {
@@ skipping 393 matching lines @@
     ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }