Convert GdkPixbufFromSkBitmap and GdkPixbufToSkBitmap

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 593 matching lines @@
     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()) {
           gtk_util::SetWindowIcon(window_, profile);
         } else {
-          GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
+          GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(icon);
           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: {
@@ skipping 16 matching lines @@
 
     // 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()) {
         // 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 = gfx::GdkPixbufFromSkBitmap(icon);
         gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);
         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();
   }
 }
@@ skipping 404 matching lines @@
 
   // Each frame of the animation is a square, so we use the height as the
   // frame size.
   int frame_size = frame_strip->height();
   size_t num_frames = frame_strip->width() / frame_size;
 
   // Make a separate GdkPixbuf for each frame of the animation.
   for (size_t i = 0; i < num_frames; ++i) {
     SkBitmap frame = SkBitmapOperations::CreateTiledBitmap(*frame_strip,
         i * frame_size, 0, frame_size, frame_size);
-    frames->push_back(gfx::GdkPixbufFromSkBitmap(&frame));
+    frames->push_back(gfx::GdkPixbufFromSkBitmap(frame));
   }
 }
 
 GdkPixbuf* BrowserTitlebar::Throbber::GetNextFrame(bool is_waiting) {
   Throbber::InitFrames();
   if (is_waiting) {
     return (*g_throbber_waiting_frames)[current_waiting_frame_++ %
         g_throbber_waiting_frames->size()];
   } else {
     return (*g_throbber_frames)[current_frame_++ % g_throbber_frames->size()];
@@ skipping 22 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);
 }